Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
commit326f784281fbbdcd91bb401b2a3e32132c0f5c72
authorChris Mason <clm@fb.com>
Wed, 20 Jan 2016 02:21:30 +0000 (19 18:21 -0800)
committerChris Mason <clm@fb.com>
Wed, 20 Jan 2016 02:21:30 +0000 (19 18:21 -0800)
treeebee8e2cf51dd901d8c31b88e1a93b1655e6abf4
parentacc308556c812485462b6b43843c3f64530dd843
parent546bed631203344611f42b2af1d224d2eedb4e6b
Merge branch 'misc-for-4.5' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5
fs/btrfs/disk-io.c
fs/btrfs/inode-map.c
fs/btrfs/ioctl.c
fs/btrfs/super.c
fs/btrfs/volumes.c