]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 13 Nov 2011 23:44:06 +0000 (10:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 13 Nov 2011 23:44:06 +0000 (10:44 +1100)

Trivial merge