]> 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>
Mon, 28 Apr 2014 23:57:05 +0000 (09:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Apr 2014 23:57:05 +0000 (09:57 +1000)

Trivial merge