Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index a97c053d3a9a..18b467dbe278 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -4,7 +4,10 @@
 #include <linux/path.h>
 
 struct fs_struct {
-        atomic_t count;
+        atomic_t count; /* This usage count is used by check_unsafe_exec() for
+                         * security checking purposes - therefore it may not be
+                         * incremented, except by clone(CLONE_FS).
+                         */
         rwlock_t lock;
         int umask;
         struct path root, pwd;