Merge tag 'v3.13' into for-3.15

Linux 3.13

Conflicts:
	include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index b609213ca9a2..653cbbd9e7ad 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1024,7 +1024,7 @@ static ssize_t bin_intvec(struct file *file,
                         if (get_user(value, vec + i))
                                 goto out_kfree;
 
-                        str += snprintf(str, end - str, "%lu\t", value);
+                        str += scnprintf(str, end - str, "%lu\t", value);
                 }
 
                 result = kernel_write(file, buffer, str - buffer, 0);
@@ -1095,7 +1095,7 @@ static ssize_t bin_ulongvec(struct file *file,
                         if (get_user(value, vec + i))
                                 goto out_kfree;
 
-                        str += snprintf(str, end - str, "%lu\t", value);
+                        str += scnprintf(str, end - str, "%lu\t", value);
                 }
 
                 result = kernel_write(file, buffer, str - buffer, 0);
@@ -1205,7 +1205,7 @@ static ssize_t bin_dn_node_address(struct file *file,
                 if (get_user(dnaddr, (__le16 __user *)newval))
                         goto out;
 
-                len = snprintf(buf, sizeof(buf), "%hu.%hu",
+                len = scnprintf(buf, sizeof(buf), "%hu.%hu",
                                 le16_to_cpu(dnaddr) >> 10,
                                 le16_to_cpu(dnaddr) & 0x3ff);