| commit | fdccffc6b711d1bfcd1e1b569537686dcad423e2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Mar 27 08:47:29 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Mar 27 08:47:29 2006 -0800 |
| tree | 51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326 | |
| parent | 4fa639123d9e6e8dfaa3d116368f4b2478da31af [diff] | |
| parent | 3eb4801d7bde42b82f05137392a1ee0ece090bad [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: [NET]: drop duplicate assignment in request_sock [IPSEC]: Fix tunnel error handling in ipcomp6