]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/timer/cleanup' into mvebu/boards
authorJason Cooper <jason@lakedaemon.net>
Sun, 17 Feb 2013 22:51:56 +0000 (22:51 +0000)
committerJason Cooper <jason@lakedaemon.net>
Sun, 17 Feb 2013 22:51:56 +0000 (22:51 +0000)
commitab7a8e7bc41545625bf1c73cb100b1f9ab0845d1
tree614882dd9239fc0e6a25f36383186fcdd18df0b6
parent7649cca52a73c10712b033b4eba908c48d9c0bb7
parent90cf214d6a549bf482e3c5751ee256cc885b96ea
Merge remote-tracking branch 'arm-soc/timer/cleanup' into mvebu/boards

Conflicts:
arch/arm/mach-dove/common.c
 - remove all DT code, it's now in mach-dove/board-dt.c

Caused by:
eff198f 'ARM: Dove: split legacy and DT setup' in mvebu/boards

Fixed build breakage for dove_defconfig by using .init_time in
mach-dove/board-dt.c's DT_MACHINE_START.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
17 files changed:
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-dove/board-dt.c
arch/arm/mach-dove/common.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/common.h
arch/arm/mach-kirkwood/dockstar-setup.c
arch/arm/mach-ks8695/board-acs5k.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-sunxi/sunxi.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-samsung/include/plat/cpu.h