MTD: merge 3.18 development into -next development
authorBrian Norris <computersforpeace@gmail.com>
Thu, 30 Oct 2014 01:56:26 +0000 (18:56 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Thu, 30 Oct 2014 01:56:26 +0000 (18:56 -0700)
To keep the two paths in sync


Trivial merge