David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
boot	xtensa: rename BUILTIN_DTB to BUILTIN_DTB_SOURCE	2019-01-26 02:02:16 -08:00
configs	xtensa: rename BUILTIN_DTB to BUILTIN_DTB_SOURCE	2019-01-26 02:02:16 -08:00
include	arch: Use asm-generic/socket.h when possible	2019-02-03 11:17:30 -08:00
kernel	xtensa: SMP: limit number of possible CPUs by NR_CPUS	2019-01-27 10:04:30 -08:00
lib	xtensa: add support for KASAN	2017-12-16 22:37:12 -08:00
mm	Xtensa updates for v4.21:	2018-12-29 09:40:40 -08:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
platforms	memblock: stop using implicit alignment to SMP_CACHE_BYTES	2018-10-31 08:54:16 -07:00
variants	xtensa: add test_kc705_be variant	2018-08-20 12:34:45 -07:00
Kconfig	xtensa: rename BUILTIN_DTB to BUILTIN_DTB_SOURCE	2019-01-26 02:02:16 -08:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Makefile	xtensa: generate uapi header and syscall table header files	2018-12-02 23:45:41 -08:00