Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Nov 2011 19:11:18 +0000 (14:11 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Nov 2011 19:11:18 +0000 (14:11 -0500)
commit39338b56382ac640614851a80e0bd71994cc664d
treec319e23181be286b1d320c29f755a81e5ef61172
parent8b7ff200010600ef7cd9d002f9f8f97edfc7578e
parenteb1852b10593dc3ca73e02bf9ac4753a5a464905
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/p54/p54spi.c
net/mac80211/debugfs_sta.c
net/mac80211/mlme.c
net/mac80211/util.c
net/wireless/reg.c