]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'osd/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:09:50 +0000 (13:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:09:50 +0000 (13:09 +1000)

Trivial merge