]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Mar 2006 16:47:29 +0000 (08:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Mar 2006 16:47:29 +0000 (08:47 -0800)
commitfdccffc6b711d1bfcd1e1b569537686dcad423e2
tree51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326
parent4fa639123d9e6e8dfaa3d116368f4b2478da31af
parent3eb4801d7bde42b82f05137392a1ee0ece090bad
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