]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 07:16:53 +0000 (17:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 07:16:53 +0000 (17:16 +1000)
commit40365b57901ea72f0111490ded108297732a222c
treec4e5d4dd3c3db277fbc1370d7e9d58bde759923e
parentfcef144ab2fd3956e3a78cb15bc3527ea378d1ae
parent3efe1ac78e996da8e141b86667cc15758aad4366
Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c
12 files changed:
fs/btrfs/ioctl.c
fs/ceph/dir.c
fs/dcache.c
fs/fuse/dir.c
fs/kernfs/dir.c
fs/mount.h
fs/namei.c
fs/namespace.c
fs/nfs/dir.c
fs/proc/base.c
fs/proc/fd.c
include/linux/dcache.h