Merge branch 'pinctrl-tegra-for-next-diet' into for-next

diff --cc drivers/pinctrl/Kconfig
Simple merge

diff --cc drivers/pinctrl/Makefile
index c95d91e,be38455..754329b
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -5,10 -5,9 +5,13 @@@ ccflags-$(CONFIG_DEBUG_PINCTRL)        += -DDE
  obj-$(CONFIG_PINCTRL)         += core.o
  obj-$(CONFIG_PINMUX)          += pinmux.o
  obj-$(CONFIG_PINCONF)         += pinconf.o
 +obj-$(CONFIG_PINCTRL_PXA3xx)  += pinctrl-pxa3xx.o
 +obj-$(CONFIG_PINCTRL_MMP2)    += pinctrl-mmp2.o
 +obj-$(CONFIG_PINCTRL_PXA168)  += pinctrl-pxa168.o
 +obj-$(CONFIG_PINCTRL_PXA910)  += pinctrl-pxa910.o
  obj-$(CONFIG_PINCTRL_SIRF)    += pinctrl-sirf.o
+ obj-$(CONFIG_PINCTRL_TEGRA)   += pinctrl-tegra.o
+ obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o
+ obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
  obj-$(CONFIG_PINCTRL_U300)    += pinctrl-u300.o
  obj-$(CONFIG_PINCTRL_COH901)  += pinctrl-coh901.o