]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'heads/clocksource' into next
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:44:26 +0000 (10:44 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:44:26 +0000 (10:44 +0900)
1  2 
drivers/clocksource/em_sti.c

Simple merge