- partially merge revision 1.9
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 14:00:26 +0000 (14:00 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 14:00:26 +0000 (14:00 +0000)
commitba265e2df8596b36c9d03f76b9edc352c7194915
treea3c97041c0941c159ca2b6c9ecb67ad8be48afea
parent82163f01d700937179c7786bbd912cf7be4e07aa
- partially merge revision 1.9
date: 2005/02/01 03:23:33;  author: mlhuang;  state: Exp;  lines: +2 -6
- bound vnet mods by #ifdef
net/ipv4/netfilter/ip_conntrack_core.c