tree 0d84d5096b34bfb794b52dc59271c184e9d3e4ea
parent 6b3ed78535c5af8c1d25ed7eaaea7557698843a1
parent 2a7b1a00206895cfa444fd83477dca67a88a9d25
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1291816473 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1291816473 +0000

Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
	sound/soc/soc-core.c

Axel's fix on two different branches.