- merge revision 1.2
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:50:10 +0000 (20:50 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:50:10 +0000 (20:50 +0000)
commit2dd7e93add7c841ebb14af0a5a5d6a0db7ab5c0e
tree9173deb6fec9ab27f1719dc20be68d898c9567de
parentd89fbc4f69e3b7d3be10ebf19c716b930b990efb
- merge revision 1.2
date: 2005/01/10 18:37:28;  author: mlhuang;  state: Exp;  lines: +4 -3
patch-o-matic-ng-20050103 conntrack-acct
net/ipv4/netfilter/ip_conntrack_proto_udp.c