tree d2c5cd3b9a16a09a933ec345e12eb9272bcd0e67
parent b3277dfaf0257221f83dd861b82c54de4507473e
parent 483479ecc565b7f5845997138eddf5ecbc2684b1
author Linus Torvalds <torvalds@woody.osdl.org> 1168446622 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1168446622 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4] devinet: inetdev_init out label moved after RCU assignment
  [INET]: style updates for the inet_sock->is_icsk assignment fix
  [SCTP]: Fix err_hdr assignment in sctp_init_cause.
  [NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value
  [NETFILTER]: nf_nat: fix hanging connections when loading the NAT module
  [NETFILTER]: arp_tables: fix userspace compilation
  [NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments