Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Mark Brown [Wed, 23 Nov 2011 18:48:57 +0000 (18:48 +0000)]
1  2 
drivers/regulator/tps65910-regulator.c
include/linux/mfd/tps65910.h

Simple merge