- merge revision 1.3
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:47:09 +0000 (20:47 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:47:09 +0000 (20:47 +0000)
commitcbbc290c1c59e788c003dbbf9b64c01ca6c05cba
treeeee14636b0a1d02e3ddd0e91affa5b3398b0d241
parent3dbaf5736e7473aca0cfc3329e0391e4dbaeec07
- merge revision 1.3
date: 2005/01/10 18:34:43;  author: mlhuang;  state: Exp;  lines: +1 -1
patch-o-matic-ng-20050103 conntrack-acct
net/ipv4/netfilter/ip_conntrack_amanda.c