Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChris Mason <clm@fb.com>
Wed, 25 Mar 2015 17:43:16 +0000 (10:43 -0700)
committerChris Mason <clm@fb.com>
Wed, 25 Mar 2015 17:43:16 +0000 (10:43 -0700)
commit9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b
treea98200a7176d8066099fde32e9691c7c36f66b1e
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6
parent258ece02126a67af263746e1ae5f8ddf0d492e14
Merge branch 'cleanups-for-4.1-v2' of git://git./linux/kernel/git/kdave/linux into for-linus-4.1
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/qgroup.c
fs/btrfs/scrub.c
fs/btrfs/super.c
fs/btrfs/transaction.c