| commit | 6cdd12acb6ea1ad8cd523369d1c326cc26c91ca1 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Fri, 2 Feb 2007 16:10:30 +0000 (2 08:10 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Fri, 2 Feb 2007 16:10:30 +0000 (2 08:10 -0800) | ||
| tree | a90d5ea27d5e6d0b3b8ad7c7ea6b231e9d6893c1 | treesnapshot (tar.gz zip) |
| parent | 583243c062dae7092890d6fb803958e36da98838 | commitdiff |
| parent | 239a87c87660d3b97a467a661eec927f0dfa9891 | commitdiff |
Merge /pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET_SCHED]: act_ipt: fix regression in ipt action
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET_SCHED]: act_ipt: fix regression in ipt action