]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'osd/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:09:25 +0000 (14:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:09:25 +0000 (14:09 +1000)

Trivial merge