]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'work.iget' into work.misc
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 8 Oct 2016 14:44:37 +0000 (10:44 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 8 Oct 2016 14:44:37 +0000 (10:44 -0400)
1  2 
fs/inode.c

diff --cc fs/inode.c
Simple merge