projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1875962 056876f)
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)
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

1  2 
arch/arm/mach-dove/common.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-dove/common.c
Simple merge
Domain: System / Kernel;