Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

1 files changed, 5 insertions, 0 deletions

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index e4b1a4d4dc..736ed917a4 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -411,6 +411,10 @@ enum
         NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
         NET_TCP_DMA_COPYBREAK=116,
         NET_TCP_SLOW_START_AFTER_IDLE=117,
+        NET_CIPSOV4_CACHE_ENABLE=118,
+        NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
+        NET_CIPSOV4_RBM_OPTFMT=120,
+        NET_CIPSOV4_RBM_STRICTVALID=121,
 };
 
 enum {
@@ -552,6 +556,7 @@ enum {
         NET_IPV6_ACCEPT_RA_RTR_PREF=20,
         NET_IPV6_RTR_PROBE_INTERVAL=21,
         NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
+        NET_IPV6_PROXY_NDP=23,
         __NET_IPV6_MAX
 };