git://git.onelab.eu / linux-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 307132a) | patch
- merge revision 1.3
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:46:42 +0000 (20:46 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:46:42 +0000 (20:46 +0000)
commit33b8a2f6482fd3bea0e9dbcb474b4c80efa3ec18
tree4a1a5cd513479adcf526e7ed4b5260b61c22722ftree | snapshot
parent307132a6699868fc35a8ac9b761ea9aa4f32b41ecommit | diff
- merge revision 1.3
date: 2005/01/10 18:31:25;  author: mlhuang;  state: Exp;  lines: +45 -0
patch-o-matic-ng-20050103 pptp-conntrack-nat conntrack-acct
net/ipv4/netfilter/Kconfig diff | blob | history
linux-2.6