MTD: merge 3.18 development into -next development
authorBrian Norris <computersforpeace@gmail.com>
Tue, 21 Oct 2014 20:46:59 +0000 (13:46 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 21 Oct 2014 20:46:59 +0000 (13:46 -0700)
To keep the two paths in sync


Trivial merge