Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516
authorDavid Sterba <dsterba@suse.com>
Mon, 16 May 2016 13:46:29 +0000 (15:46 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 16 May 2016 13:46:29 +0000 (15:46 +0200)
commit680834ca0ad4e9827048d4bda1e38db69c3dd1e4
tree595935ba3afc91dce9be83ca65932f3cf1379436
parent36fac9e9ff20f71fe7ba21978f5949a38d390a4b
parent14b05c5106312744badb463e7fb9a78811e44fc0
Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516

# Conflicts:
# include/uapi/linux/btrfs.h
fs/btrfs/ctree.h
fs/btrfs/volumes.h
include/uapi/linux/btrfs.h