]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'dev/gfp-flags' into for-next-4.6-20160203
authorDavid Sterba <dsterba@suse.com>
Wed, 3 Feb 2016 09:22:31 +0000 (10:22 +0100)
committerDavid Sterba <dsterba@suse.com>
Wed, 3 Feb 2016 09:22:31 +0000 (10:22 +0100)
1  2 
fs/btrfs/scrub.c
fs/btrfs/send.c

Simple merge
diff --cc fs/btrfs/send.c
Simple merge