diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 21:12:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 21:12:42 -0400 |
| commit | 27d30b0f4e0c8e63f48ef400a64fc073b71bfe59 (patch) | |
| tree | 55440b5ab26f8d8f0ad6702f69fd29202239785d /drivers | |
| parent | 2cb8a57b9851805883dfe92cf5d88a726134a384 (diff) | |
| parent | 75e252d981c0e80c14ce90df246e9b1300474c4f (diff) | |
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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions