mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 17:24:17 +08:00
952414505f
* '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
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| bast-ide.c | ||
| bast-irq.c | ||
| cpu-freq.c | ||
| dma.c | ||
| h1940-bluetooth.c | ||
| Kconfig | ||
| mach-amlm5900.c | ||
| mach-bast.c | ||
| mach-h1940.c | ||
| mach-n30.c | ||
| mach-otom.c | ||
| mach-qt2410.c | ||
| mach-smdk2410.c | ||
| mach-tct_hammer.c | ||
| mach-vr1000.c | ||
| Makefile | ||
| Makefile.boot | ||
| nor-simtec.c | ||
| nor-simtec.h | ||
| pll.c | ||
| pm-h1940.S | ||
| pm.c | ||
| s3c2410.c | ||
| sleep.S | ||
| usb-simtec.c | ||
| usb-simtec.h | ||