From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 2 Feb 2007 16:10:30 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.20~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cdd12acb6ea1ad8cd523369d1c326cc26c91ca1;p=pandora-kernel.git

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
---

6cdd12acb6ea1ad8cd523369d1c326cc26c91ca1
Reading git-diff-tree failed