Merge tag 'v3.17-rc5' from upstream
authorBrian Norris <computersforpeace@gmail.com>
Mon, 15 Sep 2014 23:28:16 +0000 (16:28 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 15 Sep 2014 23:28:16 +0000 (16:28 -0700)
commit7622d4905a038961da6b1c6c3fe4be6c3dad7ef9
treecce9f4bc0ef2de31cee8e06e2cd6358dd51fa9c5
parent5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3
parent9e82bf014195d6f0054982c463575cdce24292be
Merge tag 'v3.17-rc5' from upstream