]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Jan 2012 15:12:45 +0000 (10:12 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Jan 2012 15:13:24 +0000 (10:13 -0500)
commitcc4a9650a6e75dcd570d852a83ba85c24ffec7aa
treea0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73
parent81e669f6ed02ba584e2ee6ba04a509a0f7318497
parent255c98c1a5e9bd962b98474e62ebe464998adcd8
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/b43legacy/dma.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/b43legacy/dma.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rt2x00/rt2800usb.c
net/mac80211/scan.c