Merge branch 'devel' into for-next

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

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

diff --cc include/linux/pinctrl/consumer.h
Simple merge