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)
commit5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59
tree0d84d5096b34bfb794b52dc59271c184e9d3e4ea
parent6b3ed78535c5af8c1d25ed7eaaea7557698843a1
parent2a7b1a00206895cfa444fd83477dca67a88a9d25
Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
sound/soc/soc-core.c

Axel's fix on two different branches.
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8962.c