]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
projects / mv-sheeva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b3ed78 2a7b1a0)
Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Dec 2010 13:54:33 +0000 (13:54 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Dec 2010 13:54:33 +0000 (13:54 +0000)
Conflicts:
sound/soc/soc-core.c

Axel's fix on two different branches.

1  2 
sound/soc/codecs/wm8580.c patch | diff1 | diff2 | blob | history
sound/soc/codecs/wm8962.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/wm8580.c
Simple merge
diff --cc sound/soc/codecs/wm8962.c
Simple merge
Linux for Marvell Sheeva based platforms