Merge v3.9-rc5 into char-misc-next

This picks up the fixes in 3.9-rc5 that we need here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 12 insertions, 11 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8b9cbc780ef9..d8e6e8cadead 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3243,6 +3243,12 @@ F:	Documentation/firmware_class/
 F:      drivers/base/firmware*.c
 F:      include/linux/firmware.h
 
+FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)
+M:      Joshua Morris <josh.h.morris@us.ibm.com>
+M:      Philip Kelleher <pjk1939@linux.vnet.ibm.com>
+S:      Maintained
+F:      drivers/block/rsxx/
+
 FLOPPY DRIVER
 M:      Jiri Kosina <jkosina@suse.cz>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -5684,7 +5690,7 @@ S:	Maintained
 F:      arch/arm/*omap*/*clock*
 
 OMAP POWER MANAGEMENT SUPPORT
-M:      Kevin Hilman <khilman@ti.com>
+M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
 F:      arch/arm/*omap*/*pm*
@@ -5778,7 +5784,7 @@ F:	arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
 M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
-M:      Kevin Hilman <khilman@ti.com>
+M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
 F:      drivers/gpio/gpio-omap.c
@@ -6210,7 +6216,7 @@ F:	include/linux/power_supply.h
 F:      drivers/power/
 
 PNP SUPPORT
-M:      Adam Belay <abelay@mit.edu>
+M:      Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 M:      Bjorn Helgaas <bhelgaas@google.com>
 S:      Maintained
 F:      drivers/pnp/
@@ -6552,12 +6558,6 @@ S:	Maintained
 F:      Documentation/blockdev/ramdisk.txt
 F:      drivers/block/brd.c
 
-RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)
-M:      Joshua Morris <josh.h.morris@us.ibm.com>
-M:      Philip Kelleher <pjk1939@linux.vnet.ibm.com>
-S:      Maintained
-F:      drivers/block/rsxx/
-
 RANDOM NUMBER DRIVER
 M:      Theodore Ts'o" <tytso@mit.edu>
 S:      Maintained
@@ -7174,7 +7174,7 @@ F:	arch/arm/mach-s3c2410/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
 M:      Sekhar Nori <nsekhar@ti.com>
-M:      Kevin Hilman <khilman@ti.com>
+M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
 T:      git git://gitorious.org/linux-davinci/linux-davinci.git
 Q:      http://patchwork.kernel.org/project/linux-davinci/list/
@@ -7707,9 +7707,10 @@ F:	include/linux/swiotlb.h
 
 SYNOPSYS ARC ARCHITECTURE
 M:      Vineet Gupta <vgupta@synopsys.com>
-L:      linux-snps-arc@vger.kernel.org
 S:      Supported
 F:      arch/arc/
+F:      Documentation/devicetree/bindings/arc/
+F:      drivers/tty/serial/arc-uart.c
 
 SYSV FILESYSTEM
 M:      Christoph Hellwig <hch@infradead.org>