From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Dec 2005 23:49:56 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6
X-Git-Tag: v2.6.15-rc6~100
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ee0a1414536d27bc29373bf23c106b8ef8ce0b;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6
---

14ee0a1414536d27bc29373bf23c106b8ef8ce0b