Merge 4.2-rc1 into MTD -next
authorBrian Norris <computersforpeace@gmail.com>
Mon, 6 Jul 2015 20:54:28 +0000 (13:54 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 6 Jul 2015 20:54:28 +0000 (13:54 -0700)

Trivial merge