tree b24f89ef0ea4542bf884a2a3eb73f7d479460eae
parent d8a0509a696de60296a66ba4fe4f9eaade497103
author Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> 1183872395 -0700
committer David S. Miller <davem@sunset.davemloft.net> 1184131057 -0700

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