k Brown <broonie@opensource.wolfsonmicro.com> 1331730903 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1331730903 +0000

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

Simple add/add conflict:
	drivers/base/regmap/regmap.c
Æ‘‡C‘