Merge branches 'topic/da9055' and 'topic/tps51632' of git://git.kernel.org/pub/scm...

author Mark Brown <[email protected]>

Tue, 27 Nov 2012 20:08:14 +0000 (20:08 +0000)

committer Mark Brown <[email protected]>

Tue, 27 Nov 2012 20:08:14 +0000 (20:08 +0000)
author Mark Brown <[email protected]>
Tue, 27 Nov 2012 20:08:14 +0000 (20:08 +0000)
committer Mark Brown <[email protected]>
Tue, 27 Nov 2012 20:08:14 +0000 (20:08 +0000)
diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc drivers/regulator/Makefile
Simple merge
author	Mark Brown <[email protected]>
	Tue, 27 Nov 2012 20:08:14 +0000 (20:08 +0000)
committer	Mark Brown <[email protected]>
	Tue, 27 Nov 2012 20:08:14 +0000 (20:08 +0000)
		1	2	3
drivers/regulator/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/regulator/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history