summaryrefslogtreecommitdiff
path: root/net/bluetooth/cmtp/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/cmtp/Makefile')
0 files changed, 0 insertions, 0 deletions
arent57b59ed2e5b91e958843609c7884794e29e6c4cb (diff)
Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs updates from Chris Mason: "Some fixes that we've collected from the list. We still have one more pending to nail down a regression in lzo compression, but I wanted to get this batch out the door" * 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: remove ->{get, set}_acl() from btrfs_dir_ro_inode_operations Btrfs: disable xattr operations on subvolume directories Btrfs: remove old tree_root case in btrfs_read_locked_inode() Btrfs: fix truncate down when no_holes feature is enabled Btrfs: Fix deadlock between direct IO and fast fsync btrfs: fix false enospc error when truncating heavily reflinked file
Diffstat (limited to 'include/kvm')