]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sh-current/sh-fixes-for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 00:47:47 +0000 (10:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 00:47:47 +0000 (10:47 +1000)

Trivial merge