Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Feb 2012 20:06:35 +0000 (15:06 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Feb 2012 20:06:35 +0000 (15:06 -0500)
commita9802d43f205faa2fff422502a1336a50b9615c3
tree57152d6c84556320570802d01bbe04cefd8a2a7d
parent0b0a635f79f91f3755b6518627ea06dd0dbfd523
parentca994a36f585432458ead9133fcfe05440edbb7b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
MAINTAINERS
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rtlwifi/rtl8192de/dm.c