From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Mar 2007 00:56:42 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc6~82
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=de326dbe0c8b61b81aab32970236ee9ee47d782a;p=linux.git

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:
  [IPV6]: Set IF_READY if the device is up and has carrier
  [NET_SCHED]: sch_htb/sch_hfsc: fix oops in qlen_notify
  [NET]: Remove dead net/sched/Makefile entry for sch_hpfq.o.
---

de326dbe0c8b61b81aab32970236ee9ee47d782a