]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ubi/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 01:05:02 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 01:05:02 +0000 (12:05 +1100)

Trivial merge