Merge kroah.com:/home/greg/linux/BK/bleed-2.6

into kroah.com:/home/greg/linux/BK/pci-2.6

diff --cc drivers/base/Makefile
index 0edaebead0326f8575acc11c83986256b9bce955,a0a708c9318dbbe3bde76d83ab6ba7025e9e5e38..31f3b7316e08e588c8d1d87226254cff7c9b487a
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  
  obj-y                 := core.o sys.o interface.o bus.o \
                           driver.o class.o class_simple.o platform.o \
-                          cpu.o firmware.o init.o map.o
+                          cpu.o firmware.o init.o map.o dmapool.o
  obj-y                 += power/
  obj-$(CONFIG_FW_LOADER)       += firmware_class.o
 -obj-$(CONFIG_NUMA)    += node.o  memblk.o
 +obj-$(CONFIG_NUMA)    += node.o

diff --cc drivers/pci/probe.c
Simple merge