Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits) ARM: tegra: update defconfig arm/tegra: Harmony: Configure PMC for low-level interrupts arm/tegra: device tree support for ventana board arm/tegra: add support for ventana pinmuxing arm/tegra: prepare Seaboard pinmux code for derived boards arm/tegra: pinmux: ioremap registers gpio/tegra: Convert to a platform device arm/tegra: Convert pinmux driver to a platform device arm/dt: Tegra: Add pinmux node to tegra20.dtsi arm/tegra: Prep boards for gpio/pinmux conversion to pdevs ARM: mx5: fix clock usage for suspend ARM i.MX entry-macro.S: remove now unused code ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER ARM i.MX tzic: add handle_irq function ARM i.MX avic: add handle_irq function ARM: mx25: Add the missing IIM base definition ARM i.MX avic: convert to use generic irq chip mx31moboard: Add poweroff support ARM: mach-qong: Add watchdog support ARM: davinci: AM18x: Add wl1271/wlan support ... Fix up conflicts in: arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-mx5/devices-imx53.h arch/arm/plat-mxc/include/mach/memory.h
Showing
- arch/arm/mach-imx/mach-pca100.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-pca100.c
- arch/arm/mach-imx/mach-pcm037.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-pcm037.c
- arch/arm/mach-imx/mach-pcm038.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-pcm038.c
- arch/arm/mach-imx/mach-pcm043.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-pcm043.c
- arch/arm/mach-imx/mach-qong.c 2 additions, 0 deletionsarch/arm/mach-imx/mach-qong.c
- arch/arm/mach-imx/mach-scb9328.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-scb9328.c
- arch/arm/mach-imx/mach-vpr200.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-vpr200.c
- arch/arm/mach-mx5/Kconfig 4 additions, 14 deletionsarch/arm/mach-mx5/Kconfig
- arch/arm/mach-mx5/board-cpuimx51.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-cpuimx51.c
- arch/arm/mach-mx5/board-cpuimx51sd.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-cpuimx51sd.c
- arch/arm/mach-mx5/board-mx50_rdp.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-mx50_rdp.c
- arch/arm/mach-mx5/board-mx51_3ds.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-mx51_3ds.c
- arch/arm/mach-mx5/board-mx51_babbage.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-mx51_babbage.c
- arch/arm/mach-mx5/board-mx51_efikamx.c 10 additions, 2 deletionsarch/arm/mach-mx5/board-mx51_efikamx.c
- arch/arm/mach-mx5/board-mx51_efikasb.c 18 additions, 1 deletionarch/arm/mach-mx5/board-mx51_efikasb.c
- arch/arm/mach-mx5/board-mx53_ard.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-mx53_ard.c
- arch/arm/mach-mx5/board-mx53_evk.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-mx53_evk.c
- arch/arm/mach-mx5/board-mx53_loco.c 21 additions, 0 deletionsarch/arm/mach-mx5/board-mx53_loco.c
- arch/arm/mach-mx5/board-mx53_smd.c 1 addition, 0 deletionsarch/arm/mach-mx5/board-mx53_smd.c
- arch/arm/mach-mx5/clock-mx51-mx53.c 2 additions, 4 deletionsarch/arm/mach-mx5/clock-mx51-mx53.c
Loading
Please register or sign in to comment