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


Trivial merge