Merge branch 'for-2.6.29' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Jan 2009 11:03:55 +0000 (11:03 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Jan 2009 11:03:55 +0000 (11:03 +0000)
commit5852973c129cf7c7e6c229abb7250673fc2a50c9
treece61401fc06a086309d496ae2e015d7d3b504ab8
parent3e8e1952e3a3dd59b11233a532ca68e6471742d9
parentc6d1662b229410e64092fe3a9caed6535fb3dc65
Merge branch 'for-2.6.29' into for-2.6.30
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/codecs/twl4030.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c