]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cd181c 4c83052)
Merge remote-tracking branch 'clockevents/clockevents/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)
Conflicts:
arch/arm/mach-rockchip/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/rockchip_timer.c


Trivial merge
Linux kernel for KaRo TX COM modules