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

author Mark Brown <[email protected]>

Sun, 30 Jun 2013 11:40:03 +0000 (12:40 +0100)

committer Mark Brown <[email protected]>

Sun, 30 Jun 2013 11:40:03 +0000 (12:40 +0100)
author Mark Brown <[email protected]>
Sun, 30 Jun 2013 11:40:03 +0000 (12:40 +0100)
committer Mark Brown <[email protected]>
Sun, 30 Jun 2013 11:40:03 +0000 (12:40 +0100)
diff --cc drivers/base/regmap/internal.h
Simple merge
diff --cc drivers/base/regmap/regmap.c
Simple merge
diff --cc include/linux/regmap.h
Simple merge
author	Mark Brown <[email protected]>
	Sun, 30 Jun 2013 11:40:03 +0000 (12:40 +0100)
committer	Mark Brown <[email protected]>
	Sun, 30 Jun 2013 11:40:03 +0000 (12:40 +0100)
		1	2
drivers/base/regmap/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/base/regmap/regmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/regmap.h	patch \|	diff1 \|	diff2 \|	blob \| history