---

yaml --- r: 190421 b: refs/heads/master c: 5477d0f h: refs/heads/master i: 190419: d920a72 v: v3
git-mirror · Apr 29, 2010 · 9c5370e · 9c5370e
1 parent 734fddc
commit 9c5370e
Show file tree

Hide file tree

Showing 104 changed files with 1,123 additions and 1,896 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bec11921a7d7b11d0b1909596636632aece5a26
+refs/heads/master: 5477d0face8a3ba4e9a1e7283692fff9c92f8e5e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -4482,17 +4482,17 @@ S:	Maintained
 F:	drivers/ata/sata_promise.*
 
 PS3 NETWORK SUPPORT
-M:	Geoff Levand <geoff@infradead.org>
+M:	Geoff Levand <geoffrey.levand@am.sony.com>
 L:	netdev@vger.kernel.org
 L:	cbe-oss-dev@ozlabs.org
-S:	Maintained
+S:	Supported
 F:	drivers/net/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
-M:	Geoff Levand <geoff@infradead.org>
+M:	Geoff Levand <geoffrey.levand@am.sony.com>
 L:	linuxppc-dev@ozlabs.org
 L:	cbe-oss-dev@ozlabs.org
-S:	Maintained
+S:	Supported
 F:	arch/powerpc/boot/ps3*
 F:	arch/powerpc/include/asm/lv1call.h
 F:	arch/powerpc/include/asm/ps3*.h

diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -253,7 +253,6 @@ config ARCH_REALVIEW
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select GPIO_PL061 if GPIOLIB
 	help
 	  This enables support for ARM Ltd RealView boards.