- merge revision 1.2
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:49:25 +0000 (20:49 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:49:25 +0000 (20:49 +0000)
commit43739825b062349c18b6c66425ed0494f5f90b43
treea796f82365a508e3615334f37766605bb7511261
parent16f36684ecc50878e15de8c26859ebddf00cec00
- merge revision 1.2
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_icmp.c