Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (321f3b87) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

321f3b87

Commit 321f3b87 authored 13 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

parents de398fb8 cbec0627

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/iwlwifi/iwl-1000.c 1 addition, 0 deletions

drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-5000.c 1 addition, 0 deletions

drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c 23 additions, 13 deletions

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-sta.c 0 additions, 5 deletions

drivers/net/wireless/iwlwifi/iwl-agn-sta.c
drivers/net/wireless/iwlwifi/iwl-agn.c 17 additions, 17 deletions

drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.h 2 additions, 0 deletions

drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/iwlwifi/iwl-core.c 17 additions, 5 deletions

drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h 2 additions, 0 deletions

drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-shared.h 2 additions, 2 deletions

drivers/net/wireless/iwlwifi/iwl-shared.h
net/mac80211/main.c 6 additions, 0 deletions

net/mac80211/main.c
net/mac80211/util.c 0 additions, 1 deletion

net/mac80211/util.c
net/wireless/reg.c 31 additions, 18 deletions

net/wireless/reg.c

with 102 additions and 61 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment