Merge v4.5-rc1 with MTD -next development
authorBrian Norris <computersforpeace@gmail.com>
Mon, 25 Jan 2016 04:34:07 +0000 (20:34 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 25 Jan 2016 04:35:03 +0000 (20:35 -0800)
To start from a good base.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Trivial merge