Merge branch 'dev/rename-keys' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:29 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:29 +0000 (15:38 +0100)
commit67d605fec1d406f6a0272be39686801d389f59c9
tree4b8e7a25138db7369f5a6e0882d591984861d303
parente22b3d1fbe596c7feba6782dab2e11c7b99f1d90
parent9f07e1d76eaeeddedcf9651395b4a8f870df31f0
Merge branch 'dev/rename-keys' into for-chris-4.6
fs/btrfs/ctree.h
fs/btrfs/volumes.c