Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 24ff7e3..9f236cd 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -482,7 +482,8 @@
NET_IPV4_CONF_ARP_ACCEPT=21,
NET_IPV4_CONF_ARP_NOTIFY=22,
NET_IPV4_CONF_ACCEPT_LOCAL=23,
- NET_IPV4_CONF_PROXY_ARP_PVLAN=24,
+ NET_IPV4_CONF_SRC_VMARK=24,
+ NET_IPV4_CONF_PROXY_ARP_PVLAN=25,
__NET_IPV4_CONF_MAX
};