Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)]
1  2 
MAINTAINERS
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

diff --cc MAINTAINERS
Simple merge