diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-24 22:17:06 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-24 22:17:06 +0100 |
commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /net/sched/sch_cbq.c | |
parent | net: arp_ioctl() must hold RTNL (diff) | |
parent | fix a shutdown regression in intel_idle (diff) | |
download | linux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz linux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/sched/sch_cbq.c')
0 files changed, 0 insertions, 0 deletions