git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce3e373 e655a43)
Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Oct 2009 09:36:28 +0000 (10:36 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Oct 2009 09:36:28 +0000 (10:36 +0100)
1  2 
sound/soc/codecs/wm8940.c patch | diff1 | diff2 | blob | history
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/wm8940.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
Pandora Kernel Repository