]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc42bd1ef7d1c94adf331b9e9a6c51533a28034c1
treea10fd81b6c7ff5ea7642b1e2462e529971e8713a
parentac21b5e183e34f8a970c1eb3fff769e4fdee9ccb
parent285e833b0738403e176b4e9259da61aab4636a64
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