]> git.baikalelectronics.ru Git - kernel.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)
commitb87a81cd1ec72390aa14e199be300edc1fd266ae
tree51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326
parentb82f6f56ef7920284944e8b3cb069eaba63cafc3
parentf918518b9ac6517986ef1bc023c8eec827207638
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