Merge branch 'topic/regmap' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 19 Nov 2014 10:48:20 +0000 (10:48 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 19 Nov 2014 10:48:20 +0000 (10:48 +0000)
1  2 
include/sound/soc.h
sound/soc/soc-core.c

Simple merge
Simple merge