Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...
Ingo Molnar [Mon, 28 Dec 2009 08:23:13 +0000 (09:23 +0100)]
1  2 
Makefile
arch/x86/kernel/apic/io_apic.c
arch/x86/lib/Makefile
include/linux/mm.h
mm/page_alloc.c

diff --cc Makefile
Simple merge
Simple merge
@@@ -20,9 -20,9 +20,9 @@@ lib-y := delay.
  lib-y += thunk_$(BITS).o
  lib-y += usercopy_$(BITS).o getuser.o putuser.o
  lib-y += memcpy_$(BITS).o
- lib-y += insn.o inat.o
+ lib-$(CONFIG_KPROBES) += insn.o inat.o
  
 -obj-y += msr-reg.o msr-reg-export.o
 +obj-y += msr.o msr-reg.o msr-reg-export.o
  
  ifeq ($(CONFIG_X86_32),y)
          obj-y += atomic64_32.o
Simple merge
diff --cc mm/page_alloc.c
Simple merge