]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0d58e4 0305cd5)
Merge branch 'integration-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/fdman...
authorChris Mason <clm@fb.com>
Thu, 22 Oct 2015 01:23:59 +0000 (18:23 -0700)
committerChris Mason <clm@fb.com>
Thu, 22 Oct 2015 01:23:59 +0000 (18:23 -0700)
1  2 
fs/btrfs/inode.c patch | diff1 | diff2 | blob | history
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.