Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/port.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot_board.c
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge