Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

author John W. Linville <linville@tuxdriver.com>

Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)

committer John W. Linville <linville@tuxdriver.com>

Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)
author John W. Linville <linville@tuxdriver.com>
Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)
committer John W. Linville <linville@tuxdriver.com>
Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 13 Dec 2010 20:20:45 +0000 (15:20 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	patch \|	diff1 \|	diff2 \|	blob \| history