]> 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, 7 Jun 2013 01:09:11 +0000 (11:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Jun 2013 01:09:11 +0000 (11:09 +1000)
commite386bbec547dfcd012835f476f695b3a2b83efc4
tree3f9c1ee701ac905dc1f16faf323f3777a89db228
parent6c437acda54d017e552f5b426bcda07e548079bb
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