Merge tag 'renesas-maintainers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kerne...

Pull "Renesas ARM Based SoC Maintainers Updates for v3.17" from Simon Horman:

* Expand ARM/SHMOBILE maintainers entry to cover
  DT and defconfig files.

* tag 'renesas-maintainers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Add DT and defconfigs to MAINTAINERS

Signed-off-by: Olof Johansson <[email protected]>

diff --combined MAINTAINERS
index 6813d0aa5ecf5c48868c6050532086b1c15f2b85,32e8a20a0743f6a87a60c6dd2905e809841b247b..c56d7d1f85229f339b3340d6700608e35a73be29
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -943,10 -943,16 +943,10 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  F:    arch/arm/mach-imx/
 +F:    arch/arm/mach-mxs/
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
 -ARM/FREESCALE MXS ARM ARCHITECTURE
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 -F:    arch/arm/mach-mxs/
 -
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1046,33 -1052,9 +1046,33 @@@ M:    Santosh Shilimkar <santosh.shilimkar
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 -F:    drivers/clk/keystone/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
 +ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clk/keystone/
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clocksource/timer-keystone.c
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/power/reset/keystone-reset.c
 +
 +ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/memory/*emif*
 +
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1314,6 -1296,20 +1314,20 @@@ W:    http://oss.renesas.co
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
+ F:    arch/arm/boot/dts/emev2*
+ F:    arch/arm/boot/dts/r7s*
+ F:    arch/arm/boot/dts/r8a*
+ F:    arch/arm/boot/dts/sh*
+ F:    arch/arm/configs/ape6evm_defconfig
+ F:    arch/arm/configs/armadillo800eva_defconfig
+ F:    arch/arm/configs/bockw_defconfig
+ F:    arch/arm/configs/genmai_defconfig
+ F:    arch/arm/configs/koelsch_defconfig
+ F:    arch/arm/configs/kzm9g_defconfig
+ F:    arch/arm/configs/lager_defconfig
+ F:    arch/arm/configs/mackerel_defconfig
+ F:    arch/arm/configs/marzen_defconfig
+ F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
  
@@@ -2935,9 -2931,6 +2949,9 @@@ L:      [email protected]
  T:    quilt http://www.infradead.org/~rdunlap/Doc/patches/
  S:    Maintained
  F:    Documentation/
 +X:    Documentation/ABI/
 +X:    Documentation/devicetree/
 +X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -3210,6 -3203,14 +3224,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/scsi/eata_pio.*
  
 -EBTABLES
 -L:    [email protected]
 -W:    http://ebtables.sourceforge.net/
 -S:    Orphan
 -F:    include/linux/netfilter_bridge/ebt_*.h
 -F:    include/uapi/linux/netfilter_bridge/ebt_*.h
 -F:    net/bridge/netfilter/ebt*.c
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -5530,11 -5531,10 +5544,11 @@@ S:   Maintaine
  F:    arch/arm/mach-lpc32xx/
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 -M:    Nagalakshmi Nandigama <[email protected]>
 -M:    Sreekanth Reddy <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 +M:    Nagalakshmi Nandigama <[email protected]>
 +M:    Praveen Krishnamoorthy <[email protected]>
 +M:    Sreekanth Reddy <[email protected]>
 +M:    Abhijit Mahajan <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  W:    http://www.lsilogic.com/support
  S:    Supported
@@@ -6119,11 -6119,12 +6133,11 @@@ F:   Documentation/networking/s2io.tx
  F:    Documentation/networking/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
 -NETFILTER/IPTABLES
 +NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
  M:    Pablo Neira Ayuso <[email protected]>
  M:    Patrick McHardy <[email protected]>
  M:    Jozsef Kadlecsik <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
@@@ -6973,7 -6974,7 +6987,7 @@@ PKUNITY SOC DRIVER
  M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +T:    git git://github.com/gxt/linux.git
  F:    drivers/input/serio/i8042-unicore32io.h
  F:    drivers/i2c/busses/i2c-puv3.c
  F:    drivers/video/fb-puv3.c
@@@ -7961,7 -7962,6 +7975,7 @@@ F:      drivers/mmc/host/sdhci-spear.
  
  SECURITY SUBSYSTEM
  M:    James Morris <[email protected]>
 +M:    Serge E. Hallyn <[email protected]>
  L:    [email protected] (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
  W:    http://kernsec.org/
@@@ -8209,15 -8209,13 +8223,15 @@@ S:   Maintaine
  F:    drivers/usb/misc/sisusbvga/
  
  SLAB ALLOCATOR
 -M:    Christoph Lameter <cl@linux-foundation.org>
 +M:    Christoph Lameter <cl@linux.com>
  M:    Pekka Enberg <[email protected]>
 -M:    Matt Mackall <[email protected]>
 +M:    David Rientjes <[email protected]>
 +M:    Joonsoo Kim <[email protected]>
 +M:    Andrew Morton <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/sl?b*.h
 -F:    mm/sl?b.c
 +F:    mm/sl?b*
  
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <[email protected]>
@@@ -9292,7 -9290,7 +9306,7 @@@ UNICORE32 ARCHITECTURE
  M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +T:    git git://github.com/gxt/linux.git
  F:    arch/unicore32/
  
  UNIFDEF
@@@ -9425,6 -9423,12 +9439,6 @@@ S:     Maintaine
  F:    drivers/usb/host/isp116x*
  F:    include/linux/usb/isp116x.h
  
 -USB KAWASAKI LSI DRIVER
 -M:    Oliver Neukum <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/serial/kl5kusb105.*
 -
  USB MASS STORAGE DRIVER
  M:    Matthew Dharm <[email protected]>
  L:    [email protected]
@@@ -9452,6 -9456,12 +9466,6 @@@ S:     Maintaine
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
 -USB OPTION-CARD DRIVER
 -M:    Matthias Urlichs <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/serial/option.c
 -
  USB PEGASUS DRIVER
  M:    Petko Manolov <[email protected]>
  L:    [email protected]
@@@ -9484,7 -9494,7 +9498,7 @@@ S:      Maintaine
  F:    drivers/net/usb/rtl8150.c
  
  USB SERIAL SUBSYSTEM
 -M:    Johan Hovold <j[email protected]>
 +M:    Johan Hovold <j[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usb-serial.txt
@@@ -9747,14 -9757,6 +9761,14 @@@ L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
  
 +VMWARE BALLOON DRIVER
 +M:    Xavier Deguillard <[email protected]>
 +M:    Philip Moltmann <[email protected]>
 +M:    "VMware, Inc." <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/vmw_balloon.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <[email protected]>
  M:    "VMware, Inc." <[email protected]>