Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[linux-2.6.git] / MAINTAINERS
index b5cebdd..a1fe87a 100644 (file)
@@ -681,6 +681,13 @@ M: sakoman@gmail.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
+P:     Philipp Zabel
+M:     philipp.zabel@gmail.com
+S:     Maintained
+F:     arch/arm/mach-pxa/hx4700.c
+F:     arch/arm/mach-pxa/include/mach/hx4700.h
+
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 P:     Kristoffer Ericson
 M:     kristoffer.ericson@gmail.com
@@ -2360,7 +2367,7 @@ F:        fs/freevxfs/
 
 FREEZER
 P:     Pavel Machek
-M:     pavel@suse.cz
+M:     pavel@ucw.cz
 P:     Rafael J. Wysocki
 M:     rjw@sisk.pl
 L:     linux-pm@lists.linux-foundation.org
@@ -4168,6 +4175,69 @@ S:       Maintained
 F:     drivers/video/riva/
 F:     drivers/video/nvidia/
 
+OMAP SUPPORT
+P:     Tony Lindgren <tony@atomide.com>
+M:     tony@atomide.com
+L:     linux-omap@vger.kernel.org
+W:     http://www.muru.com/linux/omap/
+W:     http://linux.omap.com/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
+S:     Maintained
+F:     arch/arm/*omap*
+
+OMAP CLOCK FRAMEWORK SUPPORT
+P:     Paul Walmsley
+M:     paul@pwsan.com
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     arch/arm/*omap*/*clock*
+
+OMAP POWER MANAGEMENT SUPPORT
+P:     Kevin Hilman
+M:     khilman@deeprootsystems.com
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     arch/arm/*omap*/*pm*
+
+OMAP AUDIO SUPPORT
+P:     Jarkko Nikula
+M:     jhnikula@gmail.com
+L:     alsa-devel@alsa-project.org (subscribers-only)
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     sound/soc/omap/
+
+OMAP FRAMEBUFFER SUPPORT
+P:     Imre Deak
+M:     imre.deak@nokia.com
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/video/omap/
+
+OMAP MMC SUPPORT
+P:     Jarkko Lavinen
+M:     jarkko.lavinen@nokia.com
+L:     linux-kernel@vger.kernel.org
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/*omap*
+
+OMAP RANDOM NUMBER GENERATOR SUPPORT
+P:     Deepak Saxena
+M:     dsaxena@plexity.net
+S:     Maintained
+F:     drivers/char/hw_random/omap-rng.c
+
+OMAP USB SUPPORT
+P:     Felipe Balbi
+M:     felipe.balbi@nokia.com
+P:     David Brownell
+M:     dbrownell@users.sourceforge.net
+L:     linux-usb@vger.kernel.org
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+
 OMFS FILESYSTEM
 P:     Bob Copeland
 M:     me@bobcopeland.com
@@ -4606,7 +4676,7 @@ F:        drivers/media/video/pvrusb2/
 
 PXA2xx/PXA3xx SUPPORT
 P:     Eric Miao
-M:     eric.miao@marvell.com
+M:     eric.y.miao@gmail.com
 P:     Russell King
 M:     linux@arm.linux.org.uk
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -4621,19 +4691,19 @@ F:      sound/soc/pxa
 
 PXA168 SUPPORT
 P:     Eric Miao
-M:     eric.miao@marvell.com
+M:     eric.y.miao@gmail.com
 P:     Jason Chagas
 M:     jason.chagas@marvell.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:     Supported
+S:     Maintained
 
 PXA910 SUPPORT
 P:     Eric Miao
-M:     eric.miao@marvell.com
+M:     eric.y.miao@gmail.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:     Supported
+S:     Maintained
 
 PXA MMCI DRIVER
 S:     Orphan
@@ -5154,7 +5224,6 @@ P:        Vincent Sanders
 M:     support@simtec.co.uk
 W:     http://www.simtec.co.uk/products/EB110ATX/
 S:     Supported
-F:     arch/arm/mach-ebsa110/
 
 SIMTEC EB2410ITX (BAST)
 P:     Ben Dooks
@@ -5568,20 +5637,6 @@ F:       drivers/misc/tifm*
 F:     drivers/mmc/host/tifm_sd.c
 F:     include/linux/tifm.h
 
-TI OMAP MMC INTERFACE DRIVER
-P:     Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:     linux-omap@vger.kernel.org
-W:     http://linux.omap.com
-W:     http://www.muru.com/linux/omap/
-S:     Maintained
-F:     drivers/mmc/host/omap.c
-
-TI OMAP RANDOM NUMBER GENERATOR SUPPORT
-P:     Deepak Saxena
-M:     dsaxena@plexity.net
-S:     Maintained
-F:     drivers/char/hw_random/omap-rng.c
-
 TIPC NETWORK LAYER
 P:     Per Liden
 M:     per.liden@ericsson.com