Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)
diff --cc drivers/regulator/tps65910-regulator.c
Simple merge
diff --cc include/linux/mfd/tps65910.h
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)
		1	2
drivers/regulator/tps65910-regulator.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/tps65910.h	patch \|	diff1 \|	diff2 \|	blob \| history