]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clockevents/clockevents/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:36:10 +0000 (14:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:36:10 +0000 (14:36 +1000)
commita9f0dfc95a61d0c0834e9a309fdb73153bbe88d4
tree3e03d2897c5bc3333a10af616dc2295c44e0b756
parented4fd26d9cacbd9355dcda1c31224daf9b6460fe
parent2529c3a330797000d699d70c9a65b8525c6652de
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
arch/arm/boot/dts/vf610.dtsi
arch/arm/boot/dts/sun6i-a31.dtsi
arch/arm/boot/dts/vf610.dtsi
arch/arm/mach-vexpress/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/Makefile