Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
authorAvi Kivity <avi@redhat.com>
Thu, 3 Dec 2009 07:30:06 +0000 (09:30 +0200)
committerAvi Kivity <avi@redhat.com>
Thu, 3 Dec 2009 07:30:06 +0000 (09:30 +0200)
commit58988b07cfe2ebe9f9b39d973fd8a083390e749f
treef7a164abe85b8aa768c58a80c1261208372fb4b0
parent22763c5cf3690a681551162c15d34d935308c8d7
parent8e7cac79808b62f242069a6ac88d364d35621371
Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33

Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/Kconfig
kernel/Makefile
kernel/fork.c