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

This commit is contained in:
Chris Mason 2015-08-09 07:35:33 -07:00
commit 46cd28555f
9 changed files with 342 additions and 58 deletions