git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b701a47 5967ed8)
Merge branch 'x86/asm' into x86/atomic
authorH. Peter Anvin <hpa@zytor.com>
Thu, 29 Apr 2010 23:53:17 +0000 (16:53 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 29 Apr 2010 23:53:17 +0000 (16:53 -0700)
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>

Trivial merge
Pandora Kernel Repository