projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e22b3d1 9f07e1d)
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)
1  2 
fs/btrfs/ctree.h patch | diff1 | diff2 | blob | history
fs/btrfs/volumes.c patch | diff1 | diff2 | blob | history

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