Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc kernel/Makefile
index d7c13d249b2d7176e4f534cf5835ba7b65749cbb,0ae57a83d481feab2630d1f5856807b298743cce..6c5112844980152377428edd6ececa111b7d2ec4
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -94,8 -94,8 +94,9 @@@ obj-$(CONFIG_X86_DS) += trace
  obj-$(CONFIG_RING_BUFFER) += trace/
  obj-$(CONFIG_SMP) += sched_cpupri.o
  obj-$(CONFIG_SLOW_WORK) += slow-work.o
 +obj-$(CONFIG_SLOW_WORK_DEBUG) += slow-work-debugfs.o
  obj-$(CONFIG_PERF_EVENTS) += perf_event.o
+ obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
  
  ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
  # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

diff --cc kernel/fork.c
Simple merge