git://git.onelab.eu / linux-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cbbc290) | patch
- merge revision 1.7
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:47:40 +0000 (20:47 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:47:40 +0000 (20:47 +0000)
commit4ff085bbcd7c1bfef5b0b95f5c7c51e1267e653b
tree2d1d9500007b4369f1b7e0b3a09adadb69f60f16tree | snapshot
parentcbbc290c1c59e788c003dbbf9b64c01ca6c05cbacommit | diff
- merge revision 1.7
date: 2005/01/10 18:58:16;  author: mlhuang;  state: Exp;  lines: +9 -7
patch-o-matic-20050103 pptp-conntrack-nat
- merge revision 1.6
date: 2005/01/10 18:36:52;  author: mlhuang;  state: Exp;  lines: +22 -4
patch-o-matic-ng-20050103 conntrack-acct
net/ipv4/netfilter/ip_conntrack_core.c diff | blob | history
linux-2.6