]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 05:40:21 +0000 (15:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 05:40:21 +0000 (15:40 +1000)
commita270b9bd185c4c3c8f22fa92045eb28b0f297530
tree37378b6a9047dfa5ac8e219d6ff7c2de1b29dcfd
parentc8e6cac2f0bb2df48558be5633a23943b8f679b5
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