Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:10:36 +0000 (16:10 -0400)
1  2 
MAINTAINERS
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-agn.c

diff --cc MAINTAINERS
Simple merge