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
..
asm	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00
asm-generic	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00
linux	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00
tools	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
trace/events	tools/lib/lockdep: Remove private kernel headers	2017-06-05 09:28:14 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-10 10:00:18 +09:00