Merge branch 'dapm' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Jun 2009 20:04:04 +0000 (21:04 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Jun 2009 20:04:04 +0000 (21:04 +0100)
commit0e09b67e5886bf549ab14ef73de35d64ac867e2b
treea0d347f99e5faf766888a040156a17fa296772db
parentfa44c077eb2a17aa6913feceb493d13f45f3fa25
parent291f3bbcacf278726911c713e14cedb71c486b16
Merge branch 'dapm' into for-2.6.32
include/sound/soc.h
sound/soc/soc-dapm.c