H. Peter Anvin d9c5841e22 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>		2010-04-29 16:53:17 -07:00
..
asm	Merge branch 'x86/asm' into x86/atomic	2010-04-29 16:53:17 -07:00