projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2b247a 2a0f5cb)
Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Oct 2009 15:01:27 +0000 (16:01 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Oct 2009 15:01:27 +0000 (16:01 +0100)
1  2 
sound/soc/davinci/davinci-pcm.c patch | diff1 | diff2 | blob | history
sound/soc/pxa/pxa-ssp.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/davinci/davinci-pcm.c
Simple merge
diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge