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

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2007-03-12 18:12:42 -07:00

parent 2cb8a57b98 75e252d981

commit 27d30b0f4e

5 changed files with 62 additions and 2631 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

net/ipv4/cipso_ipv4.c

View file

2

net/ipv4/igmp.c

View file

80

net/rose/af_rose.c

View file

2600

net/wanrouter/af_wanpipe.c

View file

6

net/xfrm/xfrm_state.c

View file