]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit559446b7e6580406ca0eef055938a4615f4519bf
treee1f589c46b3ff79bbe7b1b2469f6362f94576da6
parent79d43abda9501b9819bf95538eea67a0206d9d3c
parentac59edd1d54abfad8325c64f289aee9b301e3e18
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>
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
arch/x86/lib/Makefile
lib/Kconfig.debug
lib/Makefile