Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

author Simon Horman <horms+renesas@verge.net.au>

Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)

committer Simon Horman <horms+renesas@verge.net.au>

Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
author Simon Horman <horms+renesas@verge.net.au>
Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
committer Simon Horman <horms+renesas@verge.net.au>
Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
diff --cc drivers/gpio/gpiolib-of.c
Simple merge
diff --cc drivers/pinctrl/pinconf.c
Simple merge
diff --cc drivers/pinctrl/pinconf.h
Simple merge
diff --cc drivers/pinctrl/pinctrl-abx500.c
Simple merge
author	Simon Horman <horms+renesas@verge.net.au>
	Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
committer	Simon Horman <horms+renesas@verge.net.au>
	Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
		1	2
drivers/gpio/gpiolib-of.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinconf.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinconf.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-abx500.c	patch \|	diff1 \|	diff2 \|	blob \| history