David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
boot	…
configs	…
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
kernel	Xtensa fixes for v4.12-rc6	2017-06-13 15:09:10 +09:00
lib	xtensa: get rid of zeroing, use RAW_COPY_USER	2017-03-28 18:24:07 -04:00
mm	…
oprofile	…
platforms	Xtensa fixes for v4.12-rc6	2017-06-13 15:09:10 +09:00
variants	…
Kconfig	CONFIG_ARCH_HAS_RAW_COPY_USER is unconditional now	2017-04-26 12:11:01 -04:00
Kconfig.debug	…
Makefile	…