]> 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)
commiteb102f53f8b3f2fb011c1a725653db4f60373e52
tree595935ba3afc91dce9be83ca65932f3cf1379436
parent237a85c2c9d4ff3a0f7285ae5f998f06a034c096
parent214f817af69805c21ffd54c83d733ae30fd564e4
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