]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:45:47 +0000 (09:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:45:47 +0000 (09:45 +1000)

Trivial merge