tree 9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d
parent ca5d376e17072c1b60c3fee66f3be58ef018952d
parent e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf
author Ingo Molnar <mingo@kernel.org> 1510047164 +0100
committer Ingo Molnar <mingo@kernel.org> 1510047164 +0100

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>