projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa695b0 d5131b6)
Merge branch 'dev/control-ioctl' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
1  2 
fs/btrfs/ctree.h patch | diff1 | diff2 | blob | history
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history
fs/btrfs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
diff --cc fs/btrfs/super.c
Simple merge