tree e1f589c46b3ff79bbe7b1b2469f6362f94576da6
parent b701a47ba48b698976fb2fe05fb285b0edc1d26a
parent 5967ed87ade85a421ef814296c3c7f182b08c225
author H. Peter Anvin <hpa@zytor.com> 1272585197 -0700
committer H. Peter Anvin <hpa@zytor.com> 1272585197 -0700

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>