]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:55:29 +0000 (13:55 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:55:29 +0000 (13:55 +0200)
commit5dcb3a085c171e58d22c8379d199aa877592089d
tree741a5a28c65ba80f04ecba5fc4704a27603fcf81
parente58f51729a2c2fd1735e9bc8f2fe65c1d5032ce8
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/namespace.c
fs/nfs/dir.c
fs/sysfs/dir.c
include/linux/dcache.h