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

..

bebob

…

dice

…

digi00x

…

fireface

…

fireworks

…

motu

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

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

oxfw

…

tascam

…

amdtp-am824.c

…

amdtp-am824.h

…

amdtp-stream-trace.h

…

amdtp-stream.c

…

amdtp-stream.h

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

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

cmp.c

…

cmp.h

…

fcp.c

…

fcp.h

…

isight.c

…

iso-resources.c

…

iso-resources.h

…

Kconfig

…

lib.c

…

lib.h

…

Makefile

…

packets-buffer.c

…

packets-buffer.h

…