From: Olof Johansson Date: Wed, 5 Sep 2012 23:27:00 +0000 (-0700) Subject: Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=402efdb48d6a6aef9e91e3112a94b679d787fef7;p=linux-beck.git 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 --- 402efdb48d6a6aef9e91e3112a94b679d787fef7