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

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

Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)

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

Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
author Samuel Ortiz <sameo@linux.intel.com>
Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
committer Samuel Ortiz <sameo@linux.intel.com>
Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
diff --cc drivers/mfd/palmas.c
Simple merge
diff --cc include/linux/mfd/palmas.h
Simple merge
author	Samuel Ortiz <sameo@linux.intel.com>
	Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
committer	Samuel Ortiz <sameo@linux.intel.com>
	Wed, 21 Aug 2013 10:08:14 +0000 (12:08 +0200)
		1	2
drivers/mfd/palmas.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/palmas.h	patch \|	diff1 \|	diff2 \|	blob \| history