Merge tag 'v3.8-rc6' into next/dt

author Olof Johansson <olof@lixom.net>

Tue, 5 Feb 2013 06:59:22 +0000 (22:59 -0800)

committer Olof Johansson <olof@lixom.net>

Tue, 5 Feb 2013 06:59:22 +0000 (22:59 -0800)
author Olof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 06:59:22 +0000 (22:59 -0800)
committer Olof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 06:59:22 +0000 (22:59 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/mfd/db8500-prcmu.c
Simple merge
diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge
author	Olof Johansson <olof@lixom.net>
	Tue, 5 Feb 2013 06:59:22 +0000 (22:59 -0800)
committer	Olof Johansson <olof@lixom.net>
	Tue, 5 Feb 2013 06:59:22 +0000 (22:59 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/db8500-prcmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	patch \|	diff1 \|	diff2 \|	blob \| history