David S. Miller 51e18a453f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict was two parallel additions of include files to sch_generic.c, no biggie. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-09 22:09:55 -05:00
..
asm-generic	bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type	2017-12-05 15:02:40 +01:00
drm	main drm pull request for v4.15	2017-11-15 20:42:10 -08:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-09 22:09:55 -05: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	Updates for 4.15 kernel merge window	2017-11-15 14:54:53 -08: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