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)
1  2 
MAINTAINERS
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rtlwifi/rtl8192de/dm.c

diff --cc MAINTAINERS
Simple merge
Simple merge