Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Mar 2011 12:37:42 +0000 (12:37 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Mar 2011 12:37:42 +0000 (12:37 +0000)
commit15086ded21ee7f065ad290c1edfdc49cf18cf96e
tree97b509b33d08a83dcd93406acfeccde4f2843ba5
parent3e5ff4dfa5a0a5627235a245665035597f050d86
parent28e868081086c495c897a48c50d2d5187ef677d2
Merge branch 'for-2.6.38' into for-2.6.39

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