]> 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>
Tue, 6 May 2014 00:53:29 +0000 (10:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 00:53:29 +0000 (10:53 +1000)

Trivial merge