- merge revision 1.8
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 14:01:25 +0000 (14:01 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 14:01:25 +0000 (14:01 +0000)
commitf3986cc4f968566ce676f68c4b954676f62e4045
treee1156148b44e79b6f28f55bdeade3320af733c0a
parentba265e2df8596b36c9d03f76b9edc352c7194915
- merge revision 1.8
date: 2005/02/01 03:23:58;  author: mlhuang;  state: Exp;  lines: +4 -2
- bound vnet mods by #ifdef
net/ipv4/netfilter/ip_conntrack_standalone.c