]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 03:00:19 +0000 (13:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 03:00:19 +0000 (13:00 +1000)
1  2 
sound/pci/ice1712/prodigy_hifi.c

Simple merge