]> 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, 16 Nov 2011 00:41:41 +0000 (11:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 00:41:41 +0000 (11:41 +1100)

Trivial merge