Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
  early_res: Need to save the allocation name in drop_range_partial()
  sparsemem: Fix compilation on PowerPC
  early_res: Add free_early_partial()
  x86: Fix non-bootmem compilation on PowerPC
  core: Move early_res from arch/x86 to kernel/
  x86: Add find_fw_memmap_area
  Move round_up/down to kernel.h
  x86: Make 32bit support NO_BOOTMEM
  early_res: Enhance check_and_double_early_res
  x86: Move back find_e820_area to e820.c
  x86: Add find_early_area_size
  x86: Separate early_res related code from e820.c
  x86: Move bios page reserve early to head32/64.c
  sparsemem: Put mem map for one node together.
  sparsemem: Put usemap for one node together
  x86: Make 64 bit use early_res instead of bootmem before slab
  x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA
  x86: Make early_node_mem get mem > 4 GB if possible
  x86: Dynamically increase early_res array size
  x86: Introduce max_early_res and early_res_count
  ...

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/numa_64.c
Simple merge

diff --cc arch/x86/pci/bus_numa.c
Simple merge

diff --cc arch/x86/pci/bus_numa.h
index 731b64e,08d8e15..804a4b4
--- 1/arch/x86/pci/bus_numa.h
--- 2/arch/x86/pci/bus_numa.h
+++ b/arch/x86/pci/bus_numa.h
@@@ -1,8 -1,9 +1,8 @@@
- #ifdef CONFIG_X86_64
- 
+ #ifndef __BUS_NUMA_H
+ #define __BUS_NUMA_H
  /*
   * sub bus (transparent) will use entres from 3 to store extra from
 - * root, so need to make sure we have enough slot there, Should we
 - * increase PCI_BUS_NUM_RESOURCES?
 + * root, so need to make sure we have enough slot there.
   */
  #define RES_NUM 16
  struct pci_root_info {

diff --cc arch/x86/pci/i386.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/page_alloc.c
Simple merge