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-Url: https://git.stricted.de/?a=commitdiff_plain;h=fdccffc6b711d1bfcd1e1b569537686dcad423e2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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