]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:30 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:30 +0000 (15:02 +0200)
commit25691330eb62649401cfb18ef518983511f6412f
tree4197a57b8e946e4280924c906d9bf30a2efc8ce8
parent645766abf88a9bde05de54c23a2f30fbdbfba746
parent40216baa0101ec7ac9ce7c4f4f4d684f3a85eb93
Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/fuse/dir.c
fs/afs/dir.c
fs/dcache.c
fs/fuse/dir.c
fs/namei.c
fs/namespace.c
fs/nfs/dir.c
fs/sysfs/dir.c
include/linux/dcache.h