Merge 'v4.12-rc1' into MTD
authorBrian Norris <computersforpeace@gmail.com>
Mon, 15 May 2017 18:19:19 +0000 (11:19 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 15 May 2017 18:19:19 +0000 (11:19 -0700)
Bring a few queued patches in sync for -next development.


Trivial merge