Merge tag 'v3.9-rc5' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 3 Apr 2013 20:18:36 +0000 (22:18 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 3 Apr 2013 20:18:36 +0000 (22:18 +0200)
commit6a7b3e970426f4bc2a8d52f81a4fda6595a9f052
tree055765564c839e456fbe4c65c8cd2c4b00d731b7
parent661462f4c6d3c9ae0bac193c65936ebfac4c95b4
parent07961ac7c0ee8b546658717034fe692fd12eefa9
Merge tag 'v3.9-rc5' into devel

Linux 3.9-rc5

Conflicts:
drivers/pinctrl/pinconf.c
drivers/gpio/gpiolib-of.c
drivers/pinctrl/mvebu/pinctrl-mvebu.c
drivers/pinctrl/pinconf.h
drivers/pinctrl/pinctrl-abx500.c
drivers/pinctrl/pinctrl-at91.c