]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'osd/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 04:41:37 +0000 (15:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 04:41:37 +0000 (15:41 +1100)

Trivial merge