From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2008 04:17:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~964
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d1671a9c15f55a1475d41269494518e348880c33;p=safe%2Fjmp%2Flinux-2.6

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  pkt_sched: Fix build with NET_SCHED disabled.
---

d1671a9c15f55a1475d41269494518e348880c33