]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:10:30 +0000 (08:10 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:10:30 +0000 (08:10 -0800)
commita195e2333db9b200d5d3f69b23c3935612f57a0a
treea90d5ea27d5e6d0b3b8ad7c7ea6b231e9d6893c1
parent8b907bb34257661f325a3ec65ba7c09c5f19ef58
parentce1feb0bce5657ff44454a096b1ebdb5f0e4e19f
Merge master.kernel.org:/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