From: Avi Kivity <avi@redhat.com>
Date: Thu, 3 Dec 2009 07:33:17 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a78054a4d28affdf93dfdc73e75b9831bc34cbef;p=users%2Fdwmw2%2Flinux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

a78054a4d28affdf93dfdc73e75b9831bc34cbef
diff --cc kernel/Makefile
index 0ae57a83d481f,d7c13d249b2d7..6c51128449801
--- a/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