Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6] / arch / x86 / include / asm / alternative.h
2009-04-28 Mathieu Desnoyersx86: clean up alternative.h
2008-10-23 H. Peter Anvinx86: Fix ASM_X86__ header guards
2008-10-23 Al Virox86, um: ... and asm-x86 move