Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits) ARM: mach-mxs: fix machines' initializers order mmc: mxcmmc: explicitly includes mach/hardware.h arm/imx: explicitly includes mach/hardware.h in pm-imx27.c arm/imx: remove mx27_setup_weimcs() from mx27.h arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c arm/imx: remove mx31_setup_weimcs() from mx31.h ARM: tegra: devices.c should include devices.h ARM: tegra: cpu-tegra: unexport two functions ARM: tegra: cpu-tegra: sparse type fix ARM: tegra: dma: staticify some tables and functions ARM: tegra: tegra2_clocks: don't export some tables ARM: tegra: tegra_powergate_is_powered should be static ARM: tegra: tegra_rtc_read_ms should be static ARM: tegra: tegra_init_cache should be static ARM: tegra: pcie: 0 -> NULL changes ARM: tegra: pcie: include board.h ARM: tegra: pcie: don't cast __iomem pointers ARM: tegra: tegra2_clocks: 0 -> NULL changes ARM: tegra: tegra2_clocks: don't cast __iomem pointers ARM: tegra: timer: don't cast __iomem pointers ... Fix up trivial conflicts in arch/arm/mach-omap2/Makefile, arch/arm/mach-u300/{Makefile.boot,core.c} arch/arm/plat-{mxc,omap}/devices.c
Showing
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/configs/mx3_defconfig 33 additions, 13 deletionsarch/arm/configs/mx3_defconfig
- arch/arm/include/asm/device.h 5 additions, 0 deletionsarch/arm/include/asm/device.h
- arch/arm/mach-davinci/devices-da8xx.c 3 additions, 0 deletionsarch/arm/mach-davinci/devices-da8xx.c
- arch/arm/mach-davinci/devices-tnetv107x.c 1 addition, 0 deletionsarch/arm/mach-davinci/devices-tnetv107x.c
- arch/arm/mach-davinci/dm355.c 1 addition, 0 deletionsarch/arm/mach-davinci/dm355.c
- arch/arm/mach-davinci/dm644x.c 1 addition, 0 deletionsarch/arm/mach-davinci/dm644x.c
- arch/arm/mach-davinci/dm646x.c 1 addition, 0 deletionsarch/arm/mach-davinci/dm646x.c
- arch/arm/mach-davinci/dma.c 1 addition, 4 deletionsarch/arm/mach-davinci/dma.c
- arch/arm/mach-exynos4/Kconfig 1 addition, 16 deletionsarch/arm/mach-exynos4/Kconfig
- arch/arm/mach-exynos4/Makefile 1 addition, 1 deletionarch/arm/mach-exynos4/Makefile
- arch/arm/mach-exynos4/mach-smdkc210.c 0 additions, 309 deletionsarch/arm/mach-exynos4/mach-smdkc210.c
- arch/arm/mach-exynos4/mach-smdkv310.c 78 additions, 0 deletionsarch/arm/mach-exynos4/mach-smdkv310.c
- arch/arm/mach-imx/Makefile 7 additions, 8 deletionsarch/arm/mach-imx/Makefile
- arch/arm/mach-imx/cache-l2x0.c 0 additions, 56 deletionsarch/arm/mach-imx/cache-l2x0.c
- arch/arm/mach-imx/mach-armadillo5x0.c 7 additions, 11 deletionsarch/arm/mach-imx/mach-armadillo5x0.c
- arch/arm/mach-imx/mach-cpuimx35.c 1 addition, 1 deletionarch/arm/mach-imx/mach-cpuimx35.c
- arch/arm/mach-imx/mach-kzm_arm11_01.c 1 addition, 0 deletionsarch/arm/mach-imx/mach-kzm_arm11_01.c
- arch/arm/mach-imx/mach-mx1ads.c 5 additions, 10 deletionsarch/arm/mach-imx/mach-mx1ads.c
- arch/arm/mach-imx/mach-mx27_3ds.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx27_3ds.c
Loading
Please register or sign in to comment