From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 13 Mar 2007 01:12:42 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc4~43
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27d30b0f4e0c8e63f48ef400a64fc073b71bfe59;p=linux-2.6

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:
  [XFRM]: Fix missing protocol comparison of larval SAs.
  [WANROUTER]: Delete superfluous source file "net/wanrouter/af_wanpipe.c".
  [IPV4]: Fix warning in ip_mc_rejoin_group.
  [ROSE]: Socket locking is a great invention.
  [ROSE]: Remove ourselves from waitqueue when receiving a signal
  [NetLabel]: parse the CIPSO ranged tag on incoming packets
---

27d30b0f4e0c8e63f48ef400a64fc073b71bfe59