From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 00:45:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'xilinx/arm-next'
X-Git-Tag: next-20130619~111
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0c94f407592ec25adef97eebea475b25d5212832;p=karo-tx-linux.git

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
---

0c94f407592ec25adef97eebea475b25d5212832