projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2f551d dd5e8e6)
Merge branch 'for-2.6.31' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Jun 2009 12:58:37 +0000 (13:58 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Jun 2009 12:58:37 +0000 (13:58 +0100)
1  2 
sound/soc/codecs/wm8903.c patch | diff1 | diff2 | blob | history
sound/soc/pxa/magician.c patch | diff1 | diff2 | blob | history
sound/soc/soc-core.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/wm8903.c
Simple merge
diff --cc sound/soc/pxa/magician.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
Domain: SCM / Uncategorized;