From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 6 Jul 2015 20:54:28 +0000 (-0700)
Subject: Merge 4.2-rc1 into MTD -next
X-Git-Tag: v4.3-rc1~102^2~42
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=83dcf400be7165af938dbd6b8ce6805c754701db;p=users%2Fwilly%2Flinux.git

Merge 4.2-rc1 into MTD -next
---

83dcf400be7165af938dbd6b8ce6805c754701db