David S. Miller e0ada51db9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-21 16:32:48 -04:00
..
asm	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00
asm-generic	mn10300: Remove the architecture	2018-03-09 23:19:56 +01:00
linux	xarray: add the xa_lock to the radix_tree_root	2018-04-11 10:28:39 -07:00
tools	tools include: Add config.h header file	2018-04-02 13:31:38 -03: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	2018-04-21 16:32:48 -04:00