]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'staging.current/staging-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:30:08 +0000 (09:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:30:08 +0000 (09:30 +1000)

Trivial merge