Merge tag 'v3.12-rc4' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 8 Oct 2013 11:27:11 +0000 (13:27 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 8 Oct 2013 11:27:11 +0000 (13:27 +0200)
commitbfabb59433fc18ff78d2818e10e212d0f85d56ae
treedd7cbead179c09c62627a84c16c802d99095ba6e
parent6a08a92ec45782e5543addf5f8785e2560a078f6
parentd0e639c9e06d44e713170031fe05fb60ebe680af
Merge tag 'v3.12-rc4' into devel

Linux 3.12-rc4
arch/arm/boot/dts/atlas6.dtsi
arch/arm/boot/dts/prima2.dtsi
drivers/pinctrl/pinctrl-palmas.c