Merge commit 'origin/x86/urgent' into x86/asm
authorH. Peter Anvin <hpa@zytor.com>
Tue, 25 Aug 2009 22:40:29 +0000 (15:40 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 25 Aug 2009 22:40:29 +0000 (15:40 -0700)
commite8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c
tree31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9
parent8b5a10fc6fd02289ea03480f93382b1a99006142
parentc62e43202e7cf50ca24bce58b255df7bf5de69d0
Merge commit 'origin/x86/urgent' into x86/asm
arch/x86/include/asm/lguest.h
arch/x86/kernel/apm_32.c
arch/x86/kernel/cpu/common.c