Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 22:09:35 +0000 (14:09 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 22:09:35 +0000 (14:09 -0800)
commit5bdc22a56549e7983c6b443298672641952ea035
treefbfd4e7453e4fd23dfef826d4610ed2aae47b36c
parentb6f4098897f30b7ea90a1c1edf35e9b20a9d828a
parente92427b289d252cfbd4cb5282d92f4ce1a5bb1fb
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c
17 files changed:
Documentation/feature-removal-schedule.txt
include/net/sch_generic.h
net/core/dev.c
net/core/rtnetlink.c
net/netfilter/nf_conntrack_netlink.c
net/sched/sch_cbq.c
net/sched/sch_dsmark.c
net/sched/sch_fifo.c
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_multiq.c
net/sched/sch_netem.c
net/sched/sch_prio.c
net/sched/sch_red.c
net/sched/sch_sfq.c
net/sched/sch_tbf.c
net/sched/sch_teql.c