]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 20:42:38 +0000 (20:42 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 20:42:38 +0000 (20:42 +0000)
1  2 
sound/soc/fsl/fsl_ssi.c

Simple merge