From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 29 Apr 2010 23:53:17 +0000 (-0700)
Subject: Merge branch 'x86/asm' into x86/atomic
X-Git-Tag: v2.6.35-rc1~518^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9c5841e22231e4e49fd0a1004164e6fce59b7a6;p=pandora-kernel.git

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>
---

d9c5841e22231e4e49fd0a1004164e6fce59b7a6
Reading git-diff-tree failed