Merge remote-tracking branch 'mfd/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/mfd/Kconfig
Simple merge
diff --cc drivers/mfd/intel_msic.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/intel_msic.c	patch \|	diff1 \|	diff2 \|	blob \| history