- merge revision 1.3
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:46:55 +0000 (20:46 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:46:55 +0000 (20:46 +0000)
commit3dbaf5736e7473aca0cfc3329e0391e4dbaeec07
tree4e64226f53a104c1f81dab3544f324f72c417ca6
parent33b8a2f6482fd3bea0e9dbcb474b4c80efa3ec18
- merge revision 1.3
date: 2005/01/10 19:02:29;  author: mlhuang;  state: Exp;  lines: +8 -0
patch-o-matic-ng-20050103 pptp-conntrack-nat
net/ipv4/netfilter/Makefile