Merge branch 'delivery/pinctrl-at91-3.8' of http://github.com/at91linux/linux-at91...

diff --cc Documentation/devicetree/bindings/arm/atmel-at91.txt
index d187e9f7cf1cf8b7fcd5bda6c6507558360a9237,8adc9a8d6be9086445b78b8075442d4125ee9423..1196290082d1ed176c03d3f985bf2539028b35c3
--- 1/Documentation/devicetree/bindings/arm/atmel-at91.txt
--- 2/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@@ -7,8 -7,14 +7,14 @@@ PIT Timer required properties
  - interrupts: Should contain interrupt for the PIT which is the IRQ line
    shared across all System Controller members.
  
+ System Timer (ST) required properties:
+ - compatible: Should be "atmel,at91rm9200-st"
+ - reg: Should contain registers location and length
+ - interrupts: Should contain interrupt for the ST which is the IRQ line
+   shared across all System Controller members.
+ 
  TC/TCLIB Timer required properties:
 -- compatible: Should be "atmel,<chip>-pit".
 +- compatible: Should be "atmel,<chip>-tcb".
    <chip> can be "at91rm9200" or "at91sam9x5"
  - reg: Should contain registers location and length
  - interrupts: Should contain all interrupts for the TC block

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

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

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

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

diff --cc arch/arm/mach-at91/generic.h
Simple merge

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