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)
commit46cd28555ffaa40162290dba203daad0ff6f7abd
treea10fd81b6c7ff5ea7642b1e2462e529971e8713a
parentda2f0f74cf7d074e5a8918c8efdf6aba4a989b4a
parente33e17ee1098d8d751552ac11c111e1c1a3db014
Merge branch 'jeffm-discard-4.3' into for-linus-4.3
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/super.c
fs/btrfs/transaction.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h