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)
Linux 3.12-rc6

Conflicts:
drivers/gpio/gpio-lynxpoint.c


Trivial merge