Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

7b29dc21

Commit 7b29dc21 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-2.6 into for-davem

parents 9a2e0fb0 dfe21582

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 8 additions, 2 deletions

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c 8 additions, 2 deletions

drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/iwlegacy/iwl-4965.c 1 addition, 1 deletion

drivers/net/wireless/iwlegacy/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-6000.c 18 additions, 10 deletions

drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn.c 3 additions, 3 deletions

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

drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/libertas/cmd.c 3 additions, 3 deletions

drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/wl12xx/conf.h 3 additions, 0 deletions

drivers/net/wireless/wl12xx/conf.h
drivers/net/wireless/wl12xx/main.c 1 addition, 0 deletions

drivers/net/wireless/wl12xx/main.c
drivers/net/wireless/wl12xx/scan.c 33 additions, 16 deletions

drivers/net/wireless/wl12xx/scan.c
drivers/net/wireless/wl12xx/scan.h 3 additions, 0 deletions

drivers/net/wireless/wl12xx/scan.h
drivers/net/wireless/zd1211rw/zd_usb.c 42 additions, 11 deletions

drivers/net/wireless/zd1211rw/zd_usb.c
include/linux/ieee80211.h 6 additions, 2 deletions

include/linux/ieee80211.h
net/bluetooth/l2cap_core.c 1 addition, 1 deletion

net/bluetooth/l2cap_core.c
net/wireless/scan.c 24 additions, 19 deletions

net/wireless/scan.c

with 155 additions and 70 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