Merge branch 'next/soc2' into for-next

* next/soc2:
  ARM: mxs: remove mach/irqs.h
  ARM: mxs: select SPARSE_IRQ
  ARM: mxs: adopt irq_domain support for icoll driver
  ARM: mxs: select MULTI_IRQ_HANDLER
  ARM: mxs: retrieve timer irq from device tree
  gpio/mxs: adopt irq_domain support for mxs gpio driver

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index dc094708ed8c10750c6512b5a27b2df30eb42626,0000000000000000000000000000000000000000..e2e1ec733843235d66ae9b06d8c39c96854273d5
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,69 -1,0 +1,73 @@@
 +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.
 +
 +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
 +
 +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
 +
 +next/maintainers:
 +[email]                 Entry for ks8695 from Arnd
 +
 +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)
 +
 +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
 +
++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
 +
 +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
 +
 +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
 +pxa/boards    git://github.com/hzhuang1/linux.git board
 +
 +
 +next/docs:
 +mvebu/docs:   git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc
 +
 +
 +
 +
 +

diff --cc arch/arm/boot/dts/imx23.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx28.dtsi
Simple merge

diff --cc arch/arm/mach-mxs/include/mach/common.h
index 4dec79563f19001edcac0518b383cd2608b981d9,10e4e12df870b98824a09dff4792e885a53f1fff..be5a9c93cb2a849fa9c5f6f99d8637b140997d02
--- 1/arch/arm/mach-mxs/include/mach/common.h
--- 2/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@@ -17,12 -17,22 +17,13 @@@ extern void mxs_timer_init(void)
  extern void mxs_restart(char, const char *);
  extern int mxs_saif_clkmux_select(unsigned int clkmux);
  
 -extern void mx23_soc_init(void);
  extern int mx23_clocks_init(void);
  extern void mx23_map_io(void);
 -extern void mx23_init_irq(void);
  
 -extern void mx28_soc_init(void);
  extern int mx28_clocks_init(void);
  extern void mx28_map_io(void);
 -extern void mx28_init_irq(void);
  
  extern void icoll_init_irq(void);
+ extern void icoll_handle_irq(struct pt_regs *);
  
 -extern struct platform_device *mxs_add_dma(const char *devid,
 -                                              resource_size_t base);
 -extern struct platform_device *mxs_add_gpio(char *name, int id,
 -                                          resource_size_t iobase, int irq);
 -
  #endif /* __MACH_MXS_COMMON_H__ */

diff --cc arch/arm/mach-mxs/mach-mxs.c
index 5cbb6376c685d128de8043c600775704aa1d9736,256ec656fc65def74b697bfeb3c452b8dbdefae6..caf11dbb3bfe8a0edd2382c77b9aca5d481e156c
--- 1/arch/arm/mach-mxs/mach-mxs.c
--- 2/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@@ -12,18 -12,13 +12,16 @@@
  
  #include <linux/clk.h>
  #include <linux/clkdev.h>
 +#include <linux/can/platform/flexcan.h>
 +#include <linux/delay.h>
  #include <linux/err.h>
 -#include <linux/init.h>
 +#include <linux/gpio.h>
  #include <linux/init.h>
- #include <linux/irqdomain.h>
  #include <linux/micrel_phy.h>
  #include <linux/mxsfb.h>
- #include <linux/of_irq.h>
  #include <linux/of_platform.h>
  #include <linux/phy.h>
 +#include <linux/pinctrl/consumer.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
  #include <mach/common.h>