Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 9 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fa7be04b0cf0..64c89c215b01 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -765,6 +765,14 @@ L:	linux-wireless@vger.kernel.org
 L:      ath9k-devel@lists.ath9k.org
 S:      Supported
 
+ATHEROS AR9170 WIRELESS DRIVER
+P:      Christian Lamparter
+M:      chunkeey@web.de
+L:      linux-wireless@vger.kernel.org
+W:      http://wireless.kernel.org/en/users/Drivers/ar9170
+S:      Maintained
+F:      drivers/net/wireless/ar9170/
+
 ATI_REMOTE2 DRIVER
 P:      Ville Syrjala
 M:      syrjala@sci.fi
@@ -3602,7 +3610,7 @@ S:	Maintained
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
 L:      linux-wireless@vger.kernel.org
-L:      rt2400-devel@lists.sourceforge.net
+L:      users@rt2x00.serialmonkey.com
 W:      http://rt2x00.serialmonkey.com/
 S:      Maintained
 T:      git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git