]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:50:01 +0000 (11:50 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:50:01 +0000 (11:50 +0200)
commit03f3336b9c3a0810821ee05320b3373cba7cb02e
treedb2d8b8dcd23b5e55422ecb6200439792e35913f
parenta0af47c5398d790516897b5d56d6ee26b297ef8d
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