]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit0c94f407592ec25adef97eebea475b25d5212832
tree5fe0e170ac96fdb3fcc66939a4c40018c0e03aed
parenta0e4dd2ce6f7db4fe019f7380ba7a40c691b0222
parent64e3fd3c96fe3416879c8ea985e606f80a28dea5
Merge remote-tracking branch 'xilinx/arm-next'

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