Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z

2012-01-06 23:15:54 -05:00
parent d10577a8d8 a218d0fdc5 ff01bb4832
commit ece2ccb668
375 changed files with 1007 additions and 1470 deletions
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -101,7 +101,7 @@
 struct pid_entry {
 	char *name;
 	int len;
-	mode_t mode;
+	umode_t mode;
 	const struct inode_operations *iop;
 	const struct file_operations *fop;
 	union proc_op op;