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
..
2017-01-24 12:37:43 -08:00
2013-12-06 02:06:29 -08:00
2016-05-25 10:40:15 -07:00
2016-10-13 17:25:40 -07:00
2017-01-24 12:37:43 -08:00