aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-27 17:56:42 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-27 17:56:42 -0700
commitde326dbe0c8b61b81aab32970236ee9ee47d782a (patch)
tree948f696e0261fb536c140560d369cdc555fc442f /kernel
parent28defbea64622f69d65a6079bf800cedb9915a5f (diff)
parent53aadcc90931dfa150f76ce9a5f9e8f3e43d57df (diff)
downloadlinux-linaro-stable-de326dbe0c8b61b81aab32970236ee9ee47d782a.tar.gz
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.
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions