Merge branch 'dev/gfp-flags' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:28 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:28 +0000 (15:38 +0100)
commite22b3d1fbe596c7feba6782dab2e11c7b99f1d90
tree50cfe9b71c227c8661b785ab3a0a5cab33ad8e3f
parent5f1b5664d97842bc5dba40c2053bf95270b6ff7a
parent66722f7c059089ad7f11eaa3e27af2321ab1b0e6
Merge branch 'dev/gfp-flags' into for-chris-4.6
fs/btrfs/ctree.c
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c