Merge branch 'renesas/cleanup' into next/dt

Dependency for renesas/dt

diff --combined MAINTAINERS
index 1c3bf5a148372fb089003caa3410e4878b48f11b,803c91ed3eec28032c7317c2a0df1e3157d98458..63fa1895e24dd00387fce10bf65f03bdf63a8986
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -615,8 -615,9 +615,8 @@@ F: Documentation/hwmon/fam15h_powe
  F:    drivers/hwmon/fam15h_power.c
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 -M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Orphan
  F:    drivers/usb/gadget/udc/amd5536udc.*
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
@@@ -788,11 -789,6 +788,11 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
 +M:    Duc Dang <[email protected]>
 +S:    Supported
 +F:    arch/arm64/boot/dts/apm/
 +
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:    Iyappan Subramanian <[email protected]>
  M:    Keyur Chudgar <[email protected]>
@@@ -812,13 -808,6 +812,13 @@@ S:       Maintaine
  F:    drivers/video/fbdev/arcfb.c
  F:    drivers/video/fbdev/core/fb_defio.c
  
 +ARCNET NETWORK LAYER
 +M:    Michael Grzeschik <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/arcnet/
 +F:    include/uapi/linux/if_arcnet.h
 +
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
  S:    Maintained
@@@ -1496,8 -1485,6 +1496,6 @@@ 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/bockw_defconfig
- F:    arch/arm/configs/marzen_defconfig
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
@@@ -3405,6 -3392,7 +3403,6 @@@ F:      drivers/staging/dgnc
  
  DIGI EPCA PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
 -M:    Mark Hounschell <[email protected]>
  M:    Daeseok Youn <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5962,7 -5950,7 +5960,7 @@@ F:      virt/kvm
  KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
  M:    Joerg Roedel <[email protected]>
  L:    [email protected]
 -W:    http://kvm.qumranet.com
 +W:    http://www.linux-kvm.org/
  S:    Maintained
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
@@@ -5970,7 -5958,7 +5968,7 @@@
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
  M:    Alexander Graf <[email protected]>
  L:    [email protected]
 -W:    http://kvm.qumranet.com
 +W:    http://www.linux-kvm.org/
  T:    git git://github.com/agraf/linux-2.6.git
  S:    Supported
  F:    arch/powerpc/include/asm/kvm*
@@@ -6462,11 -6450,11 +6460,11 @@@ F:   drivers/hwmon/ltc4261.
  LTP (Linux Test Project)
  M:    Mike Frysinger <[email protected]>
  M:    Cyril Hrubis <[email protected]>
 -M:    Wanlong Gao <[email protected].com>
 +M:    Wanlong Gao <wanlong.gao@gmail.com>
  M:    Jan Stancek <[email protected]>
  M:    Stanislav Kholmanskikh <[email protected]>
  M:    Alexey Kodanev <[email protected]>
 -L:    ltp[email protected]t (subscribers-only)
 +L:    ltp@lists.linux.it (subscribers-only)
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  S:    Maintained
@@@ -8510,6 -8498,7 +8508,6 @@@ F:      Documentation/networking/LICENSE.qla
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Shahed Shaikh <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -9913,8 -9902,8 +9911,8 @@@ F:      drivers/staging/media/lirc
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:    Oleg Drokin <[email protected]>
  M:    Andreas Dilger <[email protected]>
 -L:    [email protected].org (moderated for non-subscribers)
 -W:    http://lustre.opensfs.org/
 +L:    [email protected].org (moderated for non-subscribers)
 +W:    http://wiki.lustre.org/
  S:    Maintained
  F:    drivers/staging/lustre
  
@@@ -10347,16 -10336,6 +10345,16 @@@ F: include/uapi/linux/thermal.
  F:    include/linux/cpu_cooling.h
  F:    Documentation/devicetree/bindings/thermal/
  
 +THERMAL/CPU_COOLING
 +M:    Amit Daniel Kachhap <[email protected]>
 +M:    Viresh Kumar <[email protected]>
 +M:    Javi Merino <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/thermal/cpu-cooling-api.txt
 +F:    drivers/thermal/cpu_cooling.c
 +F:    include/linux/cpu_cooling.h
 +
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <[email protected]>
  S:    Maintained
@@@ -11206,7 -11185,7 +11204,7 @@@ F:   drivers/vlynq/vlynq.
  F:    include/linux/vlynq.h
  
  VME SUBSYSTEM
 -M:    Martyn Welch <martyn[email protected]>
 +M:    Martyn Welch <martyn@welchs.me.uk>
  M:    Manohar Vanga <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -11258,6 -11237,7 +11256,6 @@@ VOLTAGE AND CURRENT REGULATOR FRAMEWOR
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
  L:    [email protected]
 -W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
  S:    Supported
@@@ -11271,7 -11251,6 +11269,7 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/net/vrf.c
  F:    include/net/vrf.h
 +F:    Documentation/networking/vrf.txt
  
  VT1211 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
@@@ -11387,15 -11366,17 +11385,15 @@@ WM97XX TOUCHSCREEN DRIVER
  M:    Mark Brown <[email protected]>
  M:    Liam Girdwood <[email protected]>
  L:    [email protected]
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-touch
 -W:    http://opensource.wolfsonmicro.com/node/7
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
  F:    drivers/input/touchscreen/*wm97*
  F:    include/linux/wm97xx.h
  
  WOLFSON MICROELECTRONICS DRIVERS
  L:    [email protected]
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 -W:    http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 +T:    git https://github.com/CirrusLogic/linux-drivers.git
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*