Merge branch 'next/cleanup' into for-next

* next/cleanup: (218 commits)
  ARM: OMAP1: Move SoC specific headers from plat to mach for omap1
  ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
  ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
  ARM: OMAP: Remove unused old gpio-switch.h
  ARM: OMAP1: Move plat/irqs.h to mach/irqs.h
  ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
  ARM: OMAP2+: Prepare for irqs.h removal
  W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
  Input: omap-keypad: Remove dependencies to mach includes
  ARM: OMAP: Move gpio.h to include/linux/platform_data
  ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
  ARM: OMAP2+: Remove unused nand_irq for GPMC
  ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
  ARM: OMAP1: Define OMAP1_INT_I2C locally
  ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
  ARM: OMAP: unwrap strings
  ARM: OMAP: clean up some smatch warnings, fix some printk(KERN_ERR ...
  ARM: OMAP2+: clean up PRCM sections of the Makefile
  ARM: OMAP2+: clean up OMAP clock Makefile sections
  ARM: OMAP2+: clean up OMAP4 PRM & sleep build directives in Makefile
  ...

Resolved remove/change conflicts in:
	arch/arm/mach-omap1/leds-h2p2-debug.c
	arch/arm/mach-omap1/leds.c

And a trivial context conflict in:
	arch/arm/plat-omap/debug-leds.c

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 7875a84c2fa47df2315432367914fc204ba36892,0000000000000000000000000000000000000000..fc26263bde35e23ff973cffe3f935202748f8d78
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,108 -1,0 +1,112 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +It also includes a couple of directly applied patches for build breaks with subject
 +The next/* branches are kept in the order in which they get applied.
 +
 +external dependencies:
 +depends/clk-3.7       git://git.linaro.org/people/mturquette/linux.git clk-3.7
 +depends/tps6589x-dt  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tps6589x-dt
++depends/tty-omap-serial git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-next @ cdd86b277dc82220aa630414896505517a02a201
 +
 +fixes:
 +
 +next/fixes-non-critical:
 +ux500/fixes-non-critical http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-updates
 +cleanup/of-deviceid-data git://git.pengutronix.de/git/ukl/linux ofdeviceiddata 
 +                              (pulled again on Sep 12)
 +imx/fixes-non-critical         git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes
 +msm/fixes-non-critical         git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-noncrit-for-3.7
 +tegra/fixes-non-critical git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-fixes
 +omap/fixes-non-critical   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-fixes-noncritical-for-v3.7
 +
 +next/cleanup:
 +cleanup/io-pci:   git://sources.calxeda.com/kernel/linux.git io-cleanup-pci-v2
 +bcmring/cleanup:  patches from Arnd
 +u300/cleanup    git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git u300-cleanup
 +csr/marco-prepare git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-prepare
 +                      (includes two patches from clk-next that adds prima2 clocks)
 +pmu/cleanup       git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.7
 +ks8695/timer      http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ks8695-time-for-arm-soc
 +                      + http://marc.info/?l=linux-arm-kernel&m=134734253519144
 +renesas/ag5evm    git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git ag5evm
 +nxp4008/removal   git://git.antcom.de/linux-2.6.git pnx4008-removal
 +pxa/clk                 git://github.com/hzhuang1/linux.git clk
 +imx/cleanup     git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-cleanup
 +msm/cleanup     git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-for-3.7
 +tegra/cleanup   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cleanup
 +tegra/board-removal git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-board-removal
 +                      depends on depends/tps6589x-dt
 +omap/gpmc-cleanup   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-gpmc-fixed-for-v3.7
 +omap/atag-cleanup   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/cleanup-omap-tags-for-v3.7
++omap/cleanup-sparseirq git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-sparseirq-for-v3.7
++                      depends on depends/tty-omap-serial
++omap/cleanup-makefile-sparse git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-makefile-sparse-for-v3.7
 +
 +next/maintainers:
 +[email]                 Entry for ks8695 from Arnd
 +tegra/maintainers git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-maintainers
 +
 +next/soc:
 +ux500/asic-id:        git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 +               + http://marc.info/?l=linux-arm-kernel&m=134667789927502
 +renesas/kzm9g   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g
 +lpc32xx/core  git://git.antcom.de/linux-2.6.git lpc32xx/core
 +renesas/soc   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
 +renesas/pmu   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pmu/cleanup
 +                      depends on pmu/cleanup (next/cleanup)
 +imx/soc               git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-soc
 +tegra/common-clk git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-common-clk
 +tegra/cpu-hotplug git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cpu-hotplug
 +omap/omap-device git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/devel-omap-device-for-v3.7
 +
 +next/dt:
 +pxa/dt:               git://github.com/hzhuang1/linux.git dt
 +renesas/soc-core git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc-core
 +csr/pinmux-dt   git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git pinmux-dt
 +lpc32xx/dts   git://git.antcom.de/linux-2.6.git lpc32xx/dts
 +mxs/dt                git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.7
 +depends/clk-3.7       git://git.linaro.org/people/mturquette/linux.git clk-3.7
 +                      -> this is a prereq for mxs/clk-dt-lookup below
 +mxs/clk-dt-lookup     git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup
 +imx/dt                git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.7
 +imx/clk-dt-lookup     git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-clk-dt-lookup
 +msm/dt                git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-dt-for-3.7
 +tegra/dt       git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-dt
 +
 +next/soc2:
 +mxs/sparse-irq        git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq
 +               (functionally depends on mxs/dt)
 +
 +next/defconfig:
 +renesas/defconfig git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git defconfig
 +lpc32xx/defconfig git://git.antcom.de/linux-2.6.git lpc32xx/defconfig
 +mxs/defconfig   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-defconfig-3.7
 +imx/defconfig   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-defconfig
 +tegra/defconfig   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-defconfig
 +
 +next/drivers:
 +devel/led-driver      git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-arm-soc
 +at91/mci      git://github.com/at91linux/linux-at91 at91-for-next-soc
 +drivers/ocp2scp       patches from Kishon Vijay Abraham I <kishon@ti.com>
 +              + http://marc.info/?l=linux-next&m=134574365000518&w=2
 +tegra/drivers-i2c     git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-drivers-i2c
 +
 +next/boards:
 +pxa/board     git://github.com/hzhuang1/linux.git board
 +ks8695/boards <1346995449-5436-1-git-send-email-gerg@snapgear.com> and
 +              <1346996139-5692-1-git-send-email-gerg@snapgear.com>
 +renesas/boards        git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards
 +               (pulled twice)
 +pxa/boards    git://github.com/hzhuang1/linux.git board
 +imx/boards    git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-boards
 +msm/boards    git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-board-for-3.7
 +
 +next/docs:
 +mvebu/docs:   git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc
 +
 +
 +
 +
 +

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/clock33xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/gpio.c
Simple merge

diff --cc arch/arm/mach-omap2/omap-wakeupgen.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/debug-leds.c
index 24e23f3dd6a889b5df44a9310d308558d8caa283,195aaae658726bf6903f9df739cb90878ede1462..0fc8175eff23f3565ef179a61a5efe6d6421c61f
--- 1/arch/arm/plat-omap/debug-leds.c
--- 2/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@@ -14,9 -12,10 +14,10 @@@
  #include <linux/platform_device.h>
  #include <linux/leds.h>
  #include <linux/io.h>
 +#include <linux/slab.h>
+ #include <linux/platform_data/gpio-omap.h>
  
  #include <mach/hardware.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
  
  #include <plat/fpga.h>

diff --cc arch/arm/plat-omap/omap_device.c
Simple merge

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

diff --cc drivers/tty/serial/mpc52xx_uart.c
Simple merge