tree 97b509b33d08a83dcd93406acfeccde4f2843ba5
parent 3e5ff4dfa5a0a5627235a245665035597f050d86
parent 28e868081086c495c897a48c50d2d5187ef677d2
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1299674262 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1299674262 +0000

Merge branch 'for-2.6.38' into for-2.6.39

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c