tree 948f696e0261fb536c140560d369cdc555fc442f
parent 28defbea64622f69d65a6079bf800cedb9915a5f
parent 53aadcc90931dfa150f76ce9a5f9e8f3e43d57df
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175043402 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175043402 -0700

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.