]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 02:40:52 +0000 (13:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 02:40:52 +0000 (13:40 +1100)

Trivial merge