]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcf4b0e9fbdf28702b4a3e2757a7cf17ec700ce09
tree595935ba3afc91dce9be83ca65932f3cf1379436
parentecf120022b37446dc902a03f3d168b73131a51e9
parentca171e64049c8c3b489914f135eb94eb53cc22c1
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