- merge revision 1.3
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:49:38 +0000 (20:49 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:49:38 +0000 (20:49 +0000)
commitd89fbc4f69e3b7d3be10ebf19c716b930b990efb
tree59e52e1a6452d8a4f758afd9fe4ef7972f6aec22
parent43739825b062349c18b6c66425ed0494f5f90b43
- merge revision 1.3
date: 2005/01/10 18:37:28;  author: mlhuang;  state: Exp;  lines: +1 -1
patch-o-matic-ng-20050103 conntrack-acct
net/ipv4/netfilter/ip_conntrack_proto_tcp.c