]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 168268a 90cf214)
Merge branch 'timer/cleanup' into late/mvebu2
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Feb 2013 17:54:15 +0000 (18:54 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Feb 2013 17:54:15 +0000 (18:54 +0100)
commit7266d48fca8ee2a15d15222c41f887e10db54c5a
tree775404bcbf8ce146ccaba905e841a3621ae7ce80tree | snapshot
parent168268a225d24da3768a88c1029fb3014b0837cacommit | diff
parent90cf214d6a549bf482e3c5751ee256cc885b96eacommit | diff
Merge branch 'timer/cleanup' into late/mvebu2

Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
16 files changed:
arch/arm/mach-davinci/board-dm646x-evm.c diff1 | diff2 | blob | history
arch/arm/mach-dove/common.c diff1 | diff2 | blob | history
arch/arm/mach-highbank/highbank.c diff1 | diff2 | blob | history
arch/arm/mach-kirkwood/board-dt.c diff1 | diff2 | blob | history
arch/arm/mach-kirkwood/common.c diff1 | diff2 | blob | history
arch/arm/mach-kirkwood/common.h diff1 | diff2 | blob | history
arch/arm/mach-kirkwood/dockstar-setup.c diff1 | diff2 | blob | history
arch/arm/mach-ks8695/board-acs5k.c diff1 | diff2 | blob | history
arch/arm/mach-nomadik/board-nhk8815.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-ams-delta.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap4panda.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/timer.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-crag6410.c diff1 | diff2 | blob | history
arch/arm/mach-sunxi/sunxi.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/cpu-db8500.c diff1 | diff2 | blob | history
arch/arm/plat-samsung/include/plat/cpu.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules