David S. Miller 4dc6758d78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-11-10 10:00:18 +09:00

..

Kconfig

…

Makefile

…

qrtr.c

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

2017-11-10 10:00:18 +09:00

qrtr.h

…

smd.c

…