]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0e4dd2 64e3fd3)
Merge remote-tracking branch 'xilinx/arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:45:41 +0000 (10:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:45:41 +0000 (10:45 +1000)
Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c


Trivial merge
Linux kernel for KaRo TX COM modules