Merge tag 'v3.18-rc4' into regulator-max77802

author Mark Brown <[email protected]>

Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)

committer Mark Brown <[email protected]>

Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
author Mark Brown <[email protected]>
Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
committer Mark Brown <[email protected]>
Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
diff --cc drivers/regulator/max77802.c
Simple merge
diff --cc drivers/regulator/of_regulator.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
committer	Mark Brown <[email protected]>
	Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
		1	2
drivers/regulator/max77802.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/of_regulator.c	patch \|	diff1 \|	diff2 \|	blob \| history