Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

bus

treewide: Move dma_ops from struct dev_archdata into struct device

2017-01-24 12:23:35 -05:00

card

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

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

common

misc: mic: Remove COSM functionality from the MIC card driver

2015-10-04 12:46:06 +01:00

cosm

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

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

cosm_client

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

host

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

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

scif

Merge branch 'linus' into locking/core, to resolve conflicts

2017-11-07 10:32:44 +01:00

vop

virtio: add context flag to find vqs

2017-05-02 23:41:43 +03:00

Kconfig

vhost: split out vringh Kconfig

2016-08-02 16:54:28 +03:00

Makefile

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

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