Merge branch 'jeffm-discard-4.3' into for-linus-4.3
authorChris Mason <clm@fb.com>
Sun, 9 Aug 2015 14:35:33 +0000 (07:35 -0700)
committerChris Mason <clm@fb.com>
Sun, 9 Aug 2015 14:35:33 +0000 (07:35 -0700)

Trivial merge