]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Nov 2010 21:19:24 +0000 (16:19 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Nov 2010 21:19:24 +0000 (16:19 -0500)
commitd7a066c92394f3e777351de0c903beeb8a08af76
treef54ce8ac77d32b4c3166b4a2ca92525174a3213b
parentccb14354017272ddac002e859a2711610b6af174
parente476a5a41ad67d0e2b4a652820c49a3923eb936b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
19 files changed:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ath/carl9170/main.c
drivers/net/wireless/ath/carl9170/usb.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/main.c
include/linux/pci_ids.h
include/net/cfg80211.h
net/wireless/nl80211.c