Merge tag 'mfd-lee-3.13-1' of git://git.linaro.org/people/ljones/mfd

author Samuel Ortiz <sameo@linux.intel.com>

Fri, 25 Oct 2013 09:03:48 +0000 (11:03 +0200)

committer Samuel Ortiz <sameo@linux.intel.com>

Fri, 25 Oct 2013 09:03:48 +0000 (11:03 +0200)
author Samuel Ortiz <sameo@linux.intel.com>
Fri, 25 Oct 2013 09:03:48 +0000 (11:03 +0200)
committer Samuel Ortiz <sameo@linux.intel.com>
Fri, 25 Oct 2013 09:03:48 +0000 (11:03 +0200)
diff --cc drivers/mfd/tps65910.c
Simple merge
diff --cc drivers/mfd/twl6040.c
Simple merge
author	Samuel Ortiz <sameo@linux.intel.com>
	Fri, 25 Oct 2013 09:03:48 +0000 (11:03 +0200)
committer	Samuel Ortiz <sameo@linux.intel.com>
	Fri, 25 Oct 2013 09:03:48 +0000 (11:03 +0200)
		1	2
drivers/mfd/tps65910.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl6040.c	patch \|	diff1 \|	diff2 \|	blob \| history