Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Merge "Samsung cleanup for v3.17" from Kukjin Kim:

Most of them are for exynos SoCs, remove useless codes and update for
PMU consolidation.

- remove unnecessary header file in mach-exynos/pmu.c
- remove unused code in mach-exynos/common.h
- remove mach-exynos/regs-pmu.h dependency from PD
- remove file path from comment section in mach-exynos

- move SYSREG definitions into mach-exynos/regs-sys.h

- add mapping PMU base address via DT for PMU cleanup

- use staic in mach-exynos/common.h
- update Samsung UART config options for low-level debug

* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Add support for mapping PMU base address via DT
  ARM: EXYNOS: Remove "linux/bug.h" from pmu.c
  ARM: EXYNOS: Remove regs-pmu.h header dependency from pm_domain
  ARM: EXYNOS: Remove file path from comment section
  ARM: EXYNOS: Move SYSREG definition into sys-reg specific file
  ARM: EXYNOS: Make exynos machine_ops as static
  ARM: EXYNOS: Remove unused code in common.h
  ARM: debug: Update Samsung UART config options
  + Linux 3.16-rc5

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 17 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 667aa63ced9d..0ea20364718d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1313,6 +1313,20 @@ W:	http://oss.renesas.com
 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/
 
@@ -6786,7 +6800,7 @@ F:	arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:      Richard Zhu <r65037@freescale.com>
-M:      Shawn Guo <shawn.guo@linaro.org>
+M:      Shawn Guo <shawn.guo@freescale.com>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -8983,7 +8997,7 @@ F:	drivers/media/radio/radio-raremono.c
 
 THERMAL
 M:      Zhang Rui <rui.zhang@intel.com>
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@ -9010,7 +9024,7 @@ S:	Maintained
 F:      drivers/platform/x86/thinkpad_acpi.c
 
 TI BANDGAP AND THERMAL DRIVER
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      drivers/thermal/ti-soc-thermal/