summaryrefslogtreecommitdiff
path: root/include/net/pkt_sched.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 15:07:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 15:07:15 -0700
commit5a791ea4fa4495f7136679cb5366f6544148e613 (patch)
treedc27644add7d5f1165db19c28c25ae842e5f96b2 /include/net/pkt_sched.h
parent8209f53d79444747782a28520187abaf689761f2 (diff)
parent9c5a2ba70251ecaab18c7a83e38b3c620223476c (diff)
downloadlwn-5a791ea4fa4495f7136679cb5366f6544148e613.tar.gz
lwn-5a791ea4fa4495f7136679cb5366f6544148e613.zip
Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: separate out drain_workqueue() from destroy_workqueue() workqueue: remove cancel_rearming_delayed_work[queue]()
Diffstat (limited to 'include/net/pkt_sched.h')
0 files changed, 0 insertions, 0 deletions