]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'clockevents/clockevents/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 03:58:40 +0000 (14:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 03:58:40 +0000 (14:58 +1100)
1  2 
drivers/clocksource/Makefile

Simple merge