projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1a0206 9ab8843)
Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)
1  2 
sound/soc/mid-x86/sst_platform.c patch | diff1 | diff2 | blob | history
sound/soc/soc-core.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/mid-x86/sst_platform.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge