]> Git Repo - linux.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <[email protected]>
Wed, 28 Mar 2007 00:56:42 +0000 (17:56 -0700)
committerLinus Torvalds <[email protected]>
Wed, 28 Mar 2007 00:56:42 +0000 (17:56 -0700)
* 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.


Trivial merge
This page took 0.044318 seconds and 4 git commands to generate.