From: Chris Mason <clm@fb.com>
Date: Sun, 9 Aug 2015 14:35:33 +0000 (-0700)
Subject: Merge branch 'jeffm-discard-4.3' into for-linus-4.3
X-Git-Tag: v4.3-rc1~72^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=46cd28555ffaa40162290dba203daad0ff6f7abd;p=users%2Fhch%2Fmisc.git

Merge branch 'jeffm-discard-4.3' into for-linus-4.3
---

46cd28555ffaa40162290dba203daad0ff6f7abd