Merge remote-tracking branch 'pinctrl/for-next'

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

Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)

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

Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)
diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7740.c
Simple merge
diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
Simple merge
diff --cc drivers/pinctrl/sh-pfc/sh_pfc.h
Simple merge
diff --cc include/linux/mfd/as3722.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)
		1	2
drivers/pinctrl/sh-pfc/pfc-r8a7740.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/sh-pfc/pfc-sh7372.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/sh-pfc/sh_pfc.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/as3722.h	patch \|	diff1 \|	diff2 \|	blob \| history