]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Sun, 31 Jul 2016 18:15:28 +0000 (11:15 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 31 Jul 2016 18:15:28 +0000 (11:15 -0700)
1  2 
fs/ext4/inode.c
fs/namei.c
fs/overlayfs/dir.c
net/ipv4/tcp_input.c

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