projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33c5f96 c09f5ca)
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
1  2 
sound/soc/fsl/fsl_dma.c patch | diff1 | diff2 | blob | history
sound/soc/soc-core.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/fsl/fsl_dma.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge