Merge tag 'v3.15-rc6' into next/defconfig
authorOlof Johansson <olof@lixom.net>
Thu, 29 May 2014 20:39:43 +0000 (13:39 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 29 May 2014 20:39:43 +0000 (13:39 -0700)
Linux 3.15-rc6


Trivial merge