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-generic	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
drm	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
linux	openvswitch: enable NSH support	2017-11-08 16:12:33 +09:00
misc	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
mtd	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
rdma	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
scsi	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
sound	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00
video	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
xen	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00