Merge remote-tracking branch 'regmap/topic/core' into regmap-next

author Mark Brown <broonie@kernel.org>

Mon, 29 Sep 2014 19:49:41 +0000 (20:49 +0100)

committer Mark Brown <broonie@kernel.org>

Mon, 29 Sep 2014 19:49:41 +0000 (20:49 +0100)
author Mark Brown <broonie@kernel.org>
Mon, 29 Sep 2014 19:49:41 +0000 (20:49 +0100)
committer Mark Brown <broonie@kernel.org>
Mon, 29 Sep 2014 19:49:41 +0000 (20:49 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/base/regmap/internal.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 29 Sep 2014 19:49:41 +0000 (20:49 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 29 Sep 2014 19:49:41 +0000 (20:49 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/base/regmap/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history