Merge branch 'regmap-asoc' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 06:00:13 +0000 (15:00 +0900)
commitbb3784ae36e3a816696ae1f5e8490eeedef3c5cf
tree90484d199022de79cf25547ace6164435f86a28f
parent18d4ed4342c14ebeebe60d267b171053efcdfa87
parent0671da189c1d75eec5f6aba786d57d25209dd2bc
Merge branch 'regmap-asoc' into for-3.2
include/sound/soc.h
sound/soc/Kconfig