Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
Al Viro [Sat, 7 Jan 2012 04:15:54 +0000 (23:15 -0500)]
1  2  3 
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

diff --cc block/genhd.c
Simple merge
Simple merge
diff --cc fs/Makefile
Simple merge
Simple merge
diff --cc fs/internal.h
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge