Merge tag 'v3.12-rc4' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 16 Oct 2013 08:05:53 +0000 (10:05 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 16 Oct 2013 08:05:53 +0000 (10:05 +0200)
Linux 3.12-rc4


Trivial merge