tree 55440b5ab26f8d8f0ad6702f69fd29202239785d
parent 2cb8a57b9851805883dfe92cf5d88a726134a384
parent 75e252d981c0e80c14ce90df246e9b1300474c4f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1173748362 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1173748362 -0700

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