projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c9e28e bcbb243)
Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:20:12 +0000 (13:20 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:20:12 +0000 (13:20 +0000)
1  2 
sound/soc/s3c24xx/rx1950_uda1380.c patch | diff1 | diff2 | blob | history
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/s3c24xx/rx1950_uda1380.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
Motorola kernel-slsi