diff options
| author | Linus Torvalds <[email protected]> | 2007-06-09 01:15:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-06-09 01:15:49 +0000 |
| commit | 81d84a94be8085475c3585596e52b06ccbedd922 (patch) | |
| tree | 3cfe28d60a3e7fdae5c0b4e5a52792f3cc79a4bc /net/ipv6/tcp_ipv6.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
| parent | [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine. (diff) | |
| download | kernel-81d84a94be8085475c3585596e52b06ccbedd922.tar.gz kernel-81d84a94be8085475c3585596e52b06ccbedd922.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine.
[NetLabel]: consolidate the struct socket/sock handling to just struct sock
[IPV4]: Do not remove idev when addresses are cleared
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions