]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:44:26 +0000 (16:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:44:26 +0000 (16:44 +1000)
commitcab26ce8b53ac38269518cd92f3958a666581606
treeaa02574a8f2cf525da1fcf05d37463f99b24720a
parent5e60cf8926a1be0fbb2b1a0107571dba494e2140
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