git://git.onelab.eu / linux-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9f2cb7c) | patch
- merge revision 1.2
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:48:46 +0000 (20:48 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:48:46 +0000 (20:48 +0000)
commitc7bdb7c0fd4c563148536d5d746649907f3af3f5
tree3b1ea24e010923609b25b83494b31fe88989bd19tree | snapshot
parent9f2cb7c761ea24d9d9622886f4f2d3fb2469be9bcommit | diff
- merge revision 1.2
date: 2005/01/10 18:37:06;  author: mlhuang;  state: Exp;  lines: +2 -2
patch-o-matic-ng-20050103 conntrack-acct
net/ipv4/netfilter/ip_conntrack_proto_generic.c diff | blob | history
linux-2.6