]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 01:37:51 +0000 (11:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 01:37:51 +0000 (11:37 +1000)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge