Merge branch 'integration-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/fdman...
authorChris Mason <clm@fb.com>
Thu, 22 Oct 2015 01:23:59 +0000 (18:23 -0700)
committerChris Mason <clm@fb.com>
Thu, 22 Oct 2015 01:23:59 +0000 (18:23 -0700)
commita408365c62762c30419018587cffd2b89836434e
tree4b2ddabcf60970141fa9758153493b2b1d95acfe
parenta0d58e48db58801a0e764e9b9c87e1782d390fcb
parent0305cd5f7fca85dae392b9ba85b116896eb7c1c7
Merge branch 'integration-4.4' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.4
fs/btrfs/inode.c
fs/btrfs/ioctl.c