Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

author Mark Brown <[email protected]>

Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)

committer Mark Brown <[email protected]>

Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
author Mark Brown <[email protected]>
Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
committer Mark Brown <[email protected]>
Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
diff --cc drivers/regulator/core.c
Simple merge
diff --cc include/linux/regulator/consumer.h
Simple merge
author	Mark Brown <[email protected]>
	Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
committer	Mark Brown <[email protected]>
	Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)
		1	2
drivers/regulator/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/regulator/consumer.h	patch \|	diff1 \|	diff2 \|	blob \| history