Merge us.ibm.com:/home/sridhar/BK/linux-2.6.1

into us.ibm.com:/home/sridhar/BK/lksctp-2.6.1

diff --cc include/linux/sysctl.h
index c94fb1d1862a71365f9bb99fb6bba8354d58c9ea,59e417054967a65235d8050c32d0be1b4d2a396c..f2f4a8a613c40e14e02d14e0063de592502f3a5c
--- 1/include/linux/sysctl.h
--- 2/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@@ -577,16 -577,9 +577,17 @@@ enum 
        NET_SCTP_HB_INTERVAL             = 10,
        NET_SCTP_PRESERVE_ENABLE         = 11,
        NET_SCTP_MAX_BURST               = 12,
+       NET_SCTP_ADDIP_ENABLE            = 13,
  };
  
 +/* /proc/sys/net/bridge */
 +enum {
 +      NET_BRIDGE_NF_CALL_ARPTABLES = 1,
 +      NET_BRIDGE_NF_CALL_IPTABLES = 2,
 +      NET_BRIDGE_NF_CALL_IP6TABLES = 3,
 +      NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
 +};
 +
  /* CTL_PROC names: */
  
  /* CTL_FS names: */

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc net/sctp/associola.c
Simple merge

diff --cc net/sctp/outqueue.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge