Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Feb 2010 16:58:14 +0000 (08:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Feb 2010 16:58:14 +0000 (08:58 -0800)
commit10be7eb36b93364b98688831ee7d26f58402bb96
treeeb13ae80fcaa8baacd804a721c5a4962a501a2a4
parent90c30335a70e96b8b8493b7deb15e6b30e6d9fce
parent5ffaf8a361b4c9025963959a744f21d8173c7669
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
16 files changed:
arch/powerpc/configs/ppc64_defconfig
drivers/net/Kconfig
drivers/net/wireless/airo.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/rtl818x/rtl8180_dev.c
net/mac80211/driver-trace.h