- merge revision 1.2
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:44:12 +0000 (20:44 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:44:12 +0000 (20:44 +0000)
commit882819b6bcb249aff399d46dc3fbb2464930db36
tree60aadfc69f1b38d782defc37d79814366b1037dd
parent05ac054ea8af185183bf0dcfeb5026cdd69fa9fe
- merge revision 1.2
date: 2005/01/10 18:55:08;  author: mlhuang;  state: Exp;  lines: +17 -5
patch-o-matic-ng-20050103 pptp-conntrack-nat
include/linux/netfilter_ipv4/ip_conntrack_tuple.h