Merge branch 'freespace-4.5' into for-linus-4.5
authorChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:29:09 +0000 (13:29 -0800)
committerChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:29:09 +0000 (13:29 -0800)
commitf0f76413d332d74446d0ee9535a29a900c4f63e4
tree01d631840c1b9bcdaff4977e10614b011079506f
parenta53fe2576955171449711933242d8fb1c13a7d5c
parentf7d3d2f99eeaa9f5c111965b1516972f4fc5e449
Merge branch 'freespace-4.5' into for-linus-4.5
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h