forked from Minki/linux
40ba95fdf1
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> |
||
---|---|---|
.. | ||
debug-macro.S | ||
entry-macro.S | ||
gpio.h | ||
hardware.h | ||
io.h | ||
irqs.h | ||
map.h | ||
picoxcell_soc.h | ||
system.h | ||
timex.h | ||
uncompress.h |