Merge tag 'v3.9-rc5' into devel

Linux 3.9-rc5

Conflicts:
	drivers/pinctrl/pinconf.c

diff --cc drivers/gpio/gpiolib-of.c
Simple merge

diff --cc drivers/pinctrl/mvebu/pinctrl-mvebu.c
Simple merge

diff --cc drivers/pinctrl/pinconf.h
Simple merge

diff --cc drivers/pinctrl/pinctrl-abx500.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-at91.c
Simple merge