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
No related branches found
No related tags found
Showing
- arch/arm/mach-at91/at91sam9g45.c 2 additions, 0 deletionsarch/arm/mach-at91/at91sam9g45.c
- arch/arm/mach-at91/at91sam9g45_devices.c 6 additions, 0 deletionsarch/arm/mach-at91/at91sam9g45_devices.c
- arch/arm/mach-at91/include/mach/board.h 5 additions, 0 deletionsarch/arm/mach-at91/include/mach/board.h
- arch/arm/mach-davinci/Kconfig 10 additions, 0 deletionsarch/arm/mach-davinci/Kconfig
- arch/arm/mach-davinci/board-da850-evm.c 114 additions, 0 deletionsarch/arm/mach-davinci/board-da850-evm.c
- arch/arm/mach-davinci/da850.c 9 additions, 0 deletionsarch/arm/mach-davinci/da850.c
- arch/arm/mach-davinci/include/mach/mmc.h 3 additions, 0 deletionsarch/arm/mach-davinci/include/mach/mmc.h
- arch/arm/mach-davinci/include/mach/mux.h 10 additions, 0 deletionsarch/arm/mach-davinci/include/mach/mux.h
- arch/arm/mach-imx/Kconfig 19 additions, 33 deletionsarch/arm/mach-imx/Kconfig
- arch/arm/mach-imx/Makefile 1 addition, 1 deletionarch/arm/mach-imx/Makefile
- arch/arm/mach-imx/clock-imx25.c 6 additions, 0 deletionsarch/arm/mach-imx/clock-imx25.c
- arch/arm/mach-imx/clock-imx27.c 2 additions, 0 deletionsarch/arm/mach-imx/clock-imx27.c
- arch/arm/mach-imx/clock-imx31.c 2 additions, 2 deletionsarch/arm/mach-imx/clock-imx31.c
- arch/arm/mach-imx/clock-imx35.c 2 additions, 1 deletionarch/arm/mach-imx/clock-imx35.c
- arch/arm/mach-imx/cpu-imx25.c 41 additions, 0 deletionsarch/arm/mach-imx/cpu-imx25.c
- arch/arm/mach-imx/cpu-imx27.c 13 additions, 15 deletionsarch/arm/mach-imx/cpu-imx27.c
- arch/arm/mach-imx/cpu-imx31.c 27 additions, 22 deletionsarch/arm/mach-imx/cpu-imx31.c
- arch/arm/mach-imx/cpu-imx35.c 14 additions, 16 deletionsarch/arm/mach-imx/cpu-imx35.c
- arch/arm/mach-imx/mach-apf9328.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-apf9328.c
- arch/arm/mach-imx/mach-armadillo5x0.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-armadillo5x0.c
Loading
Please register or sign in to comment