Merge tag 'v3.12-rc6' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Sat, 19 Oct 2013 21:24:03 +0000 (23:24 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Sat, 19 Oct 2013 21:24:03 +0000 (23:24 +0200)
commitb41fb43911b4cb864812adec88d028cc6219f23e
treef383de554dc3640ec3081ad41fa34f7cab68de82
parent0963d59bc0bbed48b06733950f5eb167e9b9a8fa
parent31d141e3a666269a3b6fcccddb0351caf7454240
Merge tag 'v3.12-rc6' into devel

Linux 3.12-rc6

Conflicts:
drivers/gpio/gpio-lynxpoint.c
MAINTAINERS
drivers/gpio/gpio-lynxpoint.c
drivers/gpio/gpiolib.c