David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-12-05 10:44:19 -05:00

..

boot

powerpc: dts: P1010: Add endianness property to flexcan node

2017-12-01 09:14:23 +01:00

configs

powerpc/configs: Enable I2C_CHARDEV for pseries and powernv

2017-10-22 12:08:31 +02:00

crypto

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

include

* x86 bugfixes: APIC, nested virtualization, IOAPIC

2017-11-30 08:15:19 -08:00

kernel

powerpc fixes for 4.15 #3

2017-12-01 08:40:17 -05:00

kvm

* x86 bugfixes: APIC, nested virtualization, IOAPIC

2017-11-30 08:15:19 -08:00

lib

powerpc fixes for 4.15 #2

2017-11-24 19:40:12 -10:00

math-emu

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

mm

powerpc fixes for 4.15 #3

2017-12-01 08:40:17 -05:00

net

powerpc updates for 4.15

2017-11-16 12:47:46 -08:00

oprofile

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

perf

powerpc fixes for 4.15 #2

2017-11-24 19:40:12 -10:00

platforms

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-25 08:37:16 -10:00

purgatory

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

sysdev

powerpc updates for 4.15

2017-11-16 12:47:46 -08:00

tools

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

xmon

powerpc updates for 4.15

2017-11-16 12:47:46 -08:00

Kconfig

powerpc updates for 4.15

2017-11-16 12:47:46 -08:00

Kconfig.debug

powerpc updates for 4.15

2017-11-16 12:47:46 -08:00

Makefile

Merge branch 'fixes' into next

2017-08-23 22:20:10 +10:00

Makefile.postlink

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00