linux/drivers/infiniband
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
..
core License cleanup: add SPDX license identifiers to some files 2017-11-02 10:04:46 -07:00
hw Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
sw Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
ulp License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig IB/core: Expose ioctl interface through experimental Kconfig 2017-08-31 08:35:14 -04:00
Makefile IB/rdmavt: Create module framework and handle driver registration 2016-03-10 20:37:04 -05:00