Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 7 Jan 2012 04:15:54 +0000 (23:15 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 7 Jan 2012 04:15:54 +0000 (23:15 -0500)
commitece2ccb668046610189d88d6aaf05aeb09c988a1
treea0349945f7537de2aca420b47ced23b6294f8b65
parentd10577a8d86a0c735488d66d32289a6d66bcfa20
parenta218d0fdc5f9004164ff151d274487f6799907d0
parentff01bb4832651c6d25ac509a06a10fcbd75c461c
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
block/genhd.c
drivers/s390/block/dasd.c
fs/Makefile
fs/cramfs/inode.c
fs/internal.h
fs/namei.c
fs/proc/base.c
include/linux/fs.h