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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index 3f97ef40ce6b987bd59de225bfa9ba1dc2e3bc59,22ef8a1abe0835cc7d0143c9456b984794c10113..ab7104fded399c60f3e7a780e150ed2f4e03be58
--- 1/arch/arm/mach-nomadik/board-nhk8815.c
--- 2/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -33,10 -33,11 +34,8 @@@
  #include <asm/mach/flash.h>
  #include <asm/mach/time.h>
  
- #include <plat/gpio-nomadik.h>
  #include <plat/mtu.h>
- #include <plat/pincfg.h>
  
 -#include <linux/platform_data/mtd-nomadik-nand.h>
 -#include <mach/fsmc.h>
 -
  #include "cpu-8815.h"
  
  /* Initial value for SRC control register: all timers use MXTAL/8 source */

diff --cc arch/arm/mach-u300/core.c
Simple merge