Merge branch 'x86/asm' into x86/atomic (d9c5841e) · Commits · github.com / kvm-riscv / linux

Commit d9c5841e authored Apr 29, 2010 by

H. Peter Anvin

Merge branch 'x86/asm' into x86/atomic



Merge reason:
	Conflict between LOCK_PREFIX_HERE and relative alternatives
	pointers

Resolved Conflicts:
	arch/x86/include/asm/alternative.h
	arch/x86/kernel/alternative.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parents b701a47b 5967ed87

Expand all Hide whitespace changes

Inline Side-by-side

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