- merge revision 1.7
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 13:51:36 +0000 (13:51 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 13:51:36 +0000 (13:51 +0000)
commit7dcbaf887e84f9c118f235c6a87d1d9d1f05dd7c
treea86b3521849679683b67593065e7de2fca55594b
parent0ddd0a1e63d104b414d02d21a517cfba7f30abce
- merge revision 1.7
date: 2005/02/01 03:09:19;  author: mlhuang;  state: Exp;  lines: +2 -0
- bound vnet mods by #ifdef
include/linux/netfilter_ipv4/ip_conntrack.h