![]() Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
clock.h | ||
core.c | ||
dummyspichip.c | ||
i2c.c | ||
i2c.h | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
mmc.c | ||
mmc.h | ||
regulator.c | ||
spi.c | ||
spi.h | ||
timer.c | ||
u300.c |