From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Sun, 8 Jul 2007 05:26:35 +0000 (-0700)
Subject: [NETFILTER]: nf_nat: merge nf_conn and nf_nat_info
X-Git-Tag: v2.6.23-rc1~1109^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b84d4a94e95727a4c65841eea23ac60c6aa329;p=pandora-kernel.git

[NETFILTER]: nf_nat: merge nf_conn and nf_nat_info

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed