]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 03:08:33 +0000 (13:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 03:08:33 +0000 (13:08 +1000)
1  2 
include/linux/regulator/consumer.h

Simple merge