]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
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)
commitd9c5841e22231e4e49fd0a1004164e6fce59b7a6
treee1f589c46b3ff79bbe7b1b2469f6362f94576da6
parentb701a47ba48b698976fb2fe05fb285b0edc1d26a
parent5967ed87ade85a421ef814296c3c7f182b08c225
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