projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d45a26b cd3ff76)
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:33 +0000 (15:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:33 +0000 (15:05 +0100)
1  2 
sound/soc/fsl/imx-pcm-fiq.c patch | diff1 | diff2 | blob | history
sound/soc/fsl/imx-ssi.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/fsl/imx-pcm-fiq.c
Simple merge
diff --cc sound/soc/fsl/imx-ssi.c
Simple merge
Domain: System / Uncategorized;