]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
projects / mirror_ubuntu-artful-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2f6d9c a6e0891)
Merge branch 'fscrypt' into origin
authorTheodore Ts'o <tytso@mit.edu>
Mon, 14 Nov 2016 03:02:22 +0000 (22:02 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 14 Nov 2016 03:02:22 +0000 (22:02 -0500)
1  2 
fs/ext4/inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/ext4/inode.c
Simple merge
Ubuntu Artful kernel mirror