git://git.onelab.eu / linux-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 277bcb8) | patch
- merge revision 1.3
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:50:28 +0000 (20:50 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:50:28 +0000 (20:50 +0000)
commit1439dd404f4c22f070b2044dbd52859f795bd109
tree3d2aa1d5aeebddff3085d2d6a8bb230d87d558e6tree | snapshot
parent277bcb8cdaffaaa876af7d6dac3ed2eaf159bb9fcommit | diff
- merge revision 1.3
date: 2005/01/10 18:58:16;  author: mlhuang;  state: Exp;  lines: +3 -3
patch-o-matic-20050103 pptp-conntrack-nat
net/ipv4/netfilter/ip_nat_core.c diff | blob | history
linux-2.6