]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'tt/misc' into dev
authorTheodore Ts'o <tytso@mit.edu>
Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
1  2 
fs/ext4/inode.c
fs/ext4/super.c

diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge