git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48539f7 fa659d8)
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:57:07 +0000 (13:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:57:07 +0000 (13:57 +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
Unnamed repository; edit this file 'description' to name the repository.