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

Conflicts:
	arch/arm/boot/dts/spear1340.dtsi

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/boot/dts/at91sam9260.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9263.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9g45.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9x5.dtsi
Simple merge

diff --cc arch/arm/boot/dts/spear1340.dtsi
index 8ea3f668df34cc159f1963f046844e15374d8321,6c09eb0a1b2bbad90683f7311c14f052a2e21ac7..d487556b71cedecdb63a0d614d043a32a01bb60b
--- 1/arch/arm/boot/dts/spear1340.dtsi
--- 2/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@@ -24,25 -24,12 +24,31 @@@
                        status = "disabled";
                };
  
 +              dma@ea800000 {
 +                      slave_info {
 +                              uart1_tx {
 +                                      bus_id = "uart1_tx";
 +                                      cfg_hi = <0x6000>;      /* 0xC << 11 */
 +                                      cfg_lo = <0>;
 +                                      src_master = <0>;
 +                                      dst_master = <1>;
 +                              };
 +                              uart1_tx {
 +                                      bus_id = "uart1_tx";
 +                                      cfg_hi = <0x680>;       /* 0xD << 7 */
 +                                      cfg_lo = <0>;
 +                                      src_master = <1>;
 +                                      dst_master = <0>;
 +                              };
 +                      };
 +              };
 +
+               pinmux: pinmux@e0700000 {
+                       compatible = "st,spear1340-pinmux";
+                       reg = <0xe0700000 0x1000>;
+                       #gpio-range-cells = <2>;
+               };
+ 
                spi1: spi@5d400000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0x5d400000 0x1000>;

diff --cc arch/arm/boot/dts/spear310.dtsi
Simple merge

diff --cc arch/arm/boot/dts/spear320.dtsi
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9x5.c
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