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

Browse source

* 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.

...

This commit is contained in:

Linus Torvalds 2007-03-27 17:56:42 -07:00

parent 28defbea64 53aadcc909

commit de326dbe0c

4 changed files with 9 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

net/ipv6/addrconf.c

View file

1

net/sched/Makefile

View file

4

net/sched/sch_hfsc.c

View file

6

net/sched/sch_htb.c

View file