Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 3 insertions, 0 deletions

diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 4bda4cf5b0f5..593b0e32d956 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -160,6 +160,9 @@ enum {
         DEVCONF_ACCEPT_DAD,
         DEVCONF_FORCE_TLLAO,
         DEVCONF_NDISC_NOTIFY,
+        DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL,
+        DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL,
+        DEVCONF_SUPPRESS_FRAG_NDISC,
         DEVCONF_MAX
 };