]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm...
authorMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:28 +0000 (13:37 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:28 +0000 (13:37 +0100)
1  2  3  4  5  6 
include/sound/soc.h

Simple merge