Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel...
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 23:27:00 +0000 (16:27 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 23:27:00 +0000 (16:27 -0700)
commit402efdb48d6a6aef9e91e3112a94b679d787fef7
tree69ed39eb1c02fd40e4a2f807f4057e18de6ac13c
parent1875962377574b4edb7b164001e3e341c25290d5
parent056876f6c73406c06d530d16d020177f5ec4a0bd
Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/dt

This branch enables device tree bindings for the CSR Prima pin control
subsystem. All patches acked by Linus W (pinctrl maintainer).

* 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  pinctrl: sirf: add DT-binding pinmux mapping support
  ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features
  ARM: PRIMA2: add missing interrupts property for pinctrl node
  + sync to Linux 3.6-rc4
arch/arm/mach-dove/common.c