projects / kernel / kernel-generic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3cd50d 4bfc4e2)
Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
1  2 
sound/soc/pxa/tosa.c patch | diff1 | diff2 | blob | history
sound/soc/pxa/zylonite.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/pxa/tosa.c
Simple merge
diff --cc sound/soc/pxa/zylonite.c
Simple merge
Domain: System / Uncategorized;