summaryrefslogtreecommitdiffstats
path: root/fs/ext4/xattr_trusted.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-08-01 19:07:50 +0200
committerDavid S. Miller <davem@davemloft.net>2017-08-01 19:07:50 +0200
commit29fda25a2d31098044f8dfa177c4d2834071828e (patch)
tree9e4be11c49a4405c19ece8f81fbb1db478da1055 /fs/ext4/xattr_trusted.c
parentMerge branch 'revert-ipv6-const' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-29fda25a2d31098044f8dfa177c4d2834071828e.tar.xz
linux-29fda25a2d31098044f8dfa177c4d2834071828e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/ext4/xattr_trusted.c')
0 files changed, 0 insertions, 0 deletions