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)
1  2 
include/sound/soc.h
sound/soc/Kconfig

Simple merge
Simple merge