Commit 8c5db92a authored 7 years ago by Ingo Molnar

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>

parents ca5d376e e4880bc5

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 78 additions and 39 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment