Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

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

Snippets Groups Projects

157ca9ea

Commit 157ca9ea authored 13 years ago by John W. Linville

Downloads
- Plain Diff

Merge branch 'master' of...

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

parents 29830406 07ae2dfc

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/bcma/scan.c 11 additions, 8 deletions

drivers/bcma/scan.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c 10 additions, 4 deletions

drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-commands.h 1 addition, 0 deletions

drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c 1 addition, 0 deletions

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/rt2x00/rt2800lib.c 4 additions, 4 deletions

drivers/net/wireless/rt2x00/rt2800lib.c
drivers/ssb/driver_pcicore.c 1 addition, 1 deletion

drivers/ssb/driver_pcicore.c
net/mac80211/rx.c 1 addition, 1 deletion

net/mac80211/rx.c

with 29 additions and 18 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