tree a90d5ea27d5e6d0b3b8ad7c7ea6b231e9d6893c1
parent 583243c062dae7092890d6fb803958e36da98838
parent 239a87c87660d3b97a467a661eec927f0dfa9891
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170432630 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170432630 -0800

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