From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 27 Mar 2006 16:47:29 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc1~275
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fdccffc6b711d1bfcd1e1b569537686dcad423e2;p=linux-2.6-omap-h63xx.git

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
---

fdccffc6b711d1bfcd1e1b569537686dcad423e2