From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 6 Jul 2007 17:30:12 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~28882
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1feb17e286339382a1ae36e0fecc4d88c2d7f123;p=kernel%2Fkernel-generic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETPOLL]: Fixups for 'fix soft lockup when removing module'
  [NET]: net/core/netevent.c should #include <net/netevent.h>
  [NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values
  [NET] skbuff: remove export of static symbol
  SCTP: Add scope_id validation for link-local binds
  SCTP: Check to make sure file is valid before setting timeout
  SCTP: Fix thinko in sctp_copy_laddrs()
---

1feb17e286339382a1ae36e0fecc4d88c2d7f123