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)
Linux 3.9-rc5

Conflicts:
drivers/pinctrl/pinconf.c

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge