Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...
authorChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
committerChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
commita53fe2576955171449711933242d8fb1c13a7d5c
tree6fd4a583f2e9606c6c61226b40a060e4c1b2dc60
parentbb9d687618695e8291f1e6209eb3211d231f97bb
parente44081ef611832b47a86abf4e36dc0ed2e950884
Merge branch 'for-chris-4.5' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.5
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c