Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 22 Dec 2010 19:27:21 +0000 (14:27 -0500)]
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h

1  2 
MAINTAINERS
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

diff --cc MAINTAINERS
Simple merge