From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 10 Feb 2008 20:03:57 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.25-rc1~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7cf712db6087342e5e7e259d3883a7b5ac3212d1;p=~emulex%2Finfiniband.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [PKT_SCHED] ematch: Fix build warning.
---

7cf712db6087342e5e7e259d3883a7b5ac3212d1