b
parent a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1331730805 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1331730805 +0000

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

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c
©^—í“