5
parent a43fd50dc99a5f65505f174eca5a421707d73b4c
parent 632a5b01db8cd4068a06f8a67720ea4f9b00d9b3
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1342981567 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1342981567 +0100

Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next

Conflicts (trivial context stuff):
	drivers/base/regmap/regmap.c
	include/linux/regmap.h
*£º™!x