Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 3 insertions, 3 deletions

diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index a4ed56cf0eac..6c28b61bb690 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -49,9 +49,9 @@ struct files_stat_struct {
 };
 
 struct inodes_stat_t {
-        int nr_inodes;
-        int nr_unused;
-        int dummy[5];           /* padding for sysctl ABI compatibility */
+        long nr_inodes;
+        long nr_unused;
+        long dummy[5];          /* padding for sysctl ABI compatibility */
 };