Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Nov 2010 17:17:12 +0000 (09:17 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Nov 2010 17:17:12 +0000 (09:17 -0800)
1  2 
drivers/net/wireless/ath/ath9k/ath9k.h
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/carl9170/usb.c
drivers/net/wireless/iwlwifi/iwl3945-base.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge