Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git...

From Kukjin Kim:
AS I commented, this makes <mach/*.h> local so that they could be removed.

* 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (26 commits)
  ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabled
  ARM: S3C64XX: make regs-syscon-power.h local
  ARM: S3C64XX: make regs-sys.h local
  ARM: S3C64XX: make regs-srom.h local
  ARM: S3C64XX: make regs-modem.h local
  ARM: S3C64XX: make regs-gpio-memport.h local
  ARM: S3C64XX: make crag6410.h local
  ARM: S3C24XX: remove dsc.c and make regs-dsc.h local
  ARM: S3C24XX: remove idle.h
  ARM: S3C2412: cleanup regs-s3c2412.h
  ARM: S3C2416: remove regs-s3c2416-mem.h and regs-s3c2416.h
  ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local
  ARM: S3C24XX: make otom-map.h local
  ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local
  ARM: S3C24XX: make h1940.h and h1940-latch.h local
  ARM: S3C24XX: make gta02.h local
  ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local
  ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local
  ARM: SAMSUNG: cleanup mach/gpio-fns.h gpio-track.h and gpio-nrs.h
  ARM: SAMSUNG: cleanup mach/regs-audss.h file
  ...

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

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/common.h
Simple merge

diff --cc arch/arm/mach-s3c24xx/h1940-bluetooth.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-anubis.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-at2440evb.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-bast.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-gta02.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-h1940.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-osiris.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-otom.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-rx1950.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-rx3715.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-smdk2413.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-smdk2416.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-smdk2440.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-smdk2443.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-vr1000.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-vstms.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-anw6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410-module.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-mini6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-real6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/pm.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/mach-smdk6450.c
Simple merge

diff --cc drivers/gpio/gpio-samsung.c
Simple merge