]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commit6cdd12acb6ea1ad8cd523369d1c326cc26c91ca1
treea90d5ea27d5e6d0b3b8ad7c7ea6b231e9d6893c1
parent583243c062dae7092890d6fb803958e36da98838
parent239a87c87660d3b97a467a661eec927f0dfa9891
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