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

author Mark Brown <[email protected]>

Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)

committer Mark Brown <[email protected]>

Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
author Mark Brown <[email protected]>
Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
committer Mark Brown <[email protected]>
Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
diff --cc drivers/regulator/core.c
Simple merge
diff --cc drivers/regulator/s2mps11.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
committer	Mark Brown <[email protected]>
	Wed, 26 Mar 2014 16:57:44 +0000 (16:57 +0000)
		1	2
drivers/regulator/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/s2mps11.c	patch \|	diff1 \|	diff2 \|	blob \| history