f807f4057e18de6ac13c
parent 1875962377574b4edb7b164001e3e341c25290d5
parent 056876f6c73406c06d530d16d020177f5ec4a0bd
author Olof Johansson <olof@lixom.net> 1346887620 -0700
committer Olof Johansson <olof@lixom.net> 1346887620 -0700

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

`