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

Merge tag 'xtensa-20170303' of git://github.com/jcmvbkbc/linux-xtensa

2017-03-03 16:17:55 -08:00

configs

xtensa: add default memmap and mmio32native options to defconfigs

2016-09-20 20:43:24 -07:00

include

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-06-15 11:59:32 -04:00

kernel

Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa

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

xtensa: migrate exception table users off module.h and onto extable.h

2017-01-24 12:41:46 -05:00

oprofile

xtensa: move oprofile stack tracing to stacktrace.c

2015-08-17 07:32:49 +03:00

platforms

Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa

2017-06-13 15:09:10 +09:00

variants

xtensa: Added Cadence CSP kernel configuration for Xtensa

2016-09-09 18:39:09 -07:00

Kconfig

CONFIG_ARCH_HAS_RAW_COPY_USER is unconditional now

2017-04-26 12:11:01 -04:00

Kconfig.debug

xtensa: disable link optimization

2014-12-15 23:47:24 -08:00

Makefile

xtensa: clean up bootable image build targets

2017-03-01 12:32:50 -08:00