Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:53 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:53 +0000 (12:48 +0100)
1  2 
drivers/base/regmap/regmap.c

Simple merge