Merge branch 'v3.18/topic/fixes' into linux-linaro-lsk-v3.18

* v3.18/topic/fixes:
  net: sysctl_net_core: Fix warning: 'one' defined but not used

net/core/sysctl_net_core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@
		#include <net/pkt_sched.h>

		static int zero = 0;
		static int one = 1;
		static int ushort_max = USHRT_MAX;
		static int min_sndbuf = SOCK_MIN_SNDBUF;
		static int min_rcvbuf = SOCK_MIN_RCVBUF;