Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub'...

author Mark Brown <[email protected]>

Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)

committer Mark Brown <[email protected]>

Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
author Mark Brown <[email protected]>
Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
committer Mark Brown <[email protected]>
Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
diff --cc Documentation/driver-model/devres.txt
Simple merge
diff --cc drivers/regulator/core.c
Simple merge
author	Mark Brown <[email protected]>
	Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
committer	Mark Brown <[email protected]>
	Sun, 18 Mar 2012 21:38:28 +0000 (21:38 +0000)
		1	2
Documentation/driver-model/devres.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/core.c	patch \|	diff1 \|	diff2 \|	blob \| history