]> 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, 6 May 2014 05:22:50 +0000 (15:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 05:22:50 +0000 (15:22 +1000)
commitbae7a2d4081fd86b6c533f8cac18b00550ddf35c
treeacf914243e0b40f00de9e562a1ae1619d795dc5e
parenta67745f7b72a9668c27aaa5a6a96b707bd067c07
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