Linus Torvalds 3044100e58 Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
  x86-64: Only set max_pfn_mapped to 512 MiB if we enter via head_64.S
  xen: Cope with unmapped pages when initializing kernel pagetable
  memblock, bootmem: Round pfn properly for memory and reserved regions
  memblock: Annotate memblock functions with __init_memblock
  memblock: Allow memblock_init to be called early
  memblock/arm: Fix memblock_region_is_memory() typo
  x86, memblock: Remove __memblock_x86_find_in_range_size()
  memblock: Fix wraparound in find_region()
  x86-32, memblock: Make add_highpages honor early reserved ranges
  x86, memblock: Fix crashkernel allocation
  arm, memblock: Fix the sparsemem build
  memblock: Fix section mismatch warnings
  powerpc, memblock: Fix memblock API change fallout
  memblock, microblaze: Fix memblock API change fallout
  x86: Remove old bootmem code
  x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve
  x86: Remove not used early_res code
  x86, memblock: Replace e820_/_early string with memblock_
  x86: Use memblock to replace early_res
  x86, memblock: Use memblock_debug to control debug message print out
  ...

Fix up trivial conflicts in arch/x86/kernel/setup.c and kernel/Makefile
2010-10-21 18:52:11 -07:00
..
2010-07-19 10:56:54 +02:00
2010-05-25 08:07:08 -07:00
2009-04-01 08:59:32 -07:00
2009-01-12 20:56:32 +01:00
2009-12-16 07:20:04 -08:00
2010-05-03 15:42:58 +02:00
2009-05-06 16:36:10 -07:00
2010-08-11 08:59:12 -07:00
2010-07-26 19:08:13 +01:00
2010-05-25 08:07:08 -07:00
2010-05-25 08:07:09 -07:00
2010-02-27 18:31:16 +01:00
2010-02-27 18:31:14 +01:00
2010-03-12 15:52:34 -08:00
2010-10-09 17:07:23 +08:00
2010-05-25 08:07:09 -07:00
2010-05-27 09:12:42 -07:00
2010-05-25 08:07:09 -07:00
2010-02-09 11:13:56 +01:00
2010-06-16 18:05:05 +02:00
2010-02-27 18:31:13 +01:00
2010-02-27 18:31:13 +01:00
2010-05-25 08:07:08 -07:00
2010-05-25 08:07:08 -07:00