Merge MTD updates into -next
authorBrian Norris <computersforpeace@gmail.com>
Sat, 28 Feb 2015 09:24:03 +0000 (01:24 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Sat, 28 Feb 2015 09:24:03 +0000 (01:24 -0800)

Trivial merge