diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 16:53:17 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 16:53:17 -0700 |
commit | d9c5841e22231e4e49fd0a1004164e6fce59b7a6 (patch) | |
tree | e1f589c46b3ff79bbe7b1b2469f6362f94576da6 /lib/crc32defs.h | |
parent | b701a47ba48b698976fb2fe05fb285b0edc1d26a (diff) | |
parent | 5967ed87ade85a421ef814296c3c7f182b08c225 (diff) | |
download | kernel_samsung_aries-d9c5841e22231e4e49fd0a1004164e6fce59b7a6.zip kernel_samsung_aries-d9c5841e22231e4e49fd0a1004164e6fce59b7a6.tar.gz kernel_samsung_aries-d9c5841e22231e4e49fd0a1004164e6fce59b7a6.tar.bz2 |
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>
Diffstat (limited to 'lib/crc32defs.h')
0 files changed, 0 insertions, 0 deletions