diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 18:47:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 18:47:29 +0200 |
| commit | fdccffc6b711d1bfcd1e1b569537686dcad423e2 (patch) | |
| tree | 51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326 /block | |
| parent | Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | [NET]: drop duplicate assignment in request_sock (diff) | |
| download | linux-fdccffc6b711d1bfcd1e1b569537686dcad423e2.tar.xz linux-fdccffc6b711d1bfcd1e1b569537686dcad423e2.zip | |
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:
[NET]: drop duplicate assignment in request_sock
[IPSEC]: Fix tunnel error handling in ipcomp6
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions