]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 00:29:37 +0000 (10:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 00:29:37 +0000 (10:29 +1000)

Trivial merge