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