git://git.onelab.eu / linux-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8e81ac3) | patch
- merge revision 1.5
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:43:25 +0000 (20:43 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:43:25 +0000 (20:43 +0000)
commit05ac054ea8af185183bf0dcfeb5026cdd69fa9fe
tree097d397ec6e81a178c05c7c47653c131dabc14aftree | snapshot
parent8e81ac31830f1bc045a2db729bc6f1c010cc4227commit | diff
- merge revision 1.5
date: 2005/01/10 18:30:56;  author: mlhuang;  state: Exp;  lines: +23 -2
patch-o-matic-ng-20050103 pptp-conntrack-nat conntrack-acct
include/linux/netfilter_ipv4/ip_conntrack.h diff | blob | history
linux-2.6