]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xilinx/arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:08:24 +0000 (11:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:08:24 +0000 (11:08 +1000)
commit39d68d7ff57d32c8fd4ae3a0657090ff01a2c0fb
treeca7c5b2db9141d593e2044f9fc9a2a45fd857399
parent84748f4fcda85a8074e289f66fc13744650c1620
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