Merge tag 'v3.13-rc4' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Thu, 26 Dec 2013 18:31:33 +0000 (10:31 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Dec 2013 18:31:33 +0000 (10:31 -0800)
Linux 3.13-rc4


Trivial merge