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
..
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-12-09 00:50:13 -08:00
2008-08-31 20:59:37 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-07-24 09:57:52 -06:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-12-16 07:20:12 -08:00
2010-01-29 08:22:01 -08:00
2008-07-27 23:00:59 +02:00
2009-06-07 05:01:00 -07:00
2009-12-17 11:03:24 -05:00
2008-08-31 20:56:15 -07:00
2008-07-30 15:40:50 -07:00
2008-07-27 23:00:59 +02:00
2008-08-24 20:33:56 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-08-29 02:15:23 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-08-10 13:47:39 -07:00
2008-07-27 23:00:59 +02:00
2009-01-04 15:44:52 -08:00
2008-07-27 23:00:59 +02:00
2010-10-07 14:08:55 +01:00
2010-10-07 14:08:55 +01:00
2010-09-22 16:35:09 -04:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-06-09 11:12:36 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-12-26 15:35:41 -08:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-01-02 21:15:25 -08:00
2008-07-27 23:00:59 +02:00
2010-01-14 03:14:53 -08:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-01-02 18:35:29 -08:00
2008-07-27 23:00:59 +02:00
2009-01-02 19:42:12 -08:00
2008-07-27 23:00:59 +02:00
2010-08-17 22:49:26 -07:00
2008-07-27 23:00:59 +02:00
2008-12-27 00:35:12 -08:00
2008-07-27 23:00:59 +02:00
2009-01-02 19:34:46 -08:00
2009-01-02 21:10:04 -08:00
2009-11-02 04:19:42 -08:00
2008-07-27 23:00:59 +02:00
2008-12-07 00:04:30 -08:00
2008-09-06 19:30:17 +01:00
2009-01-06 18:10:27 -08:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-09-19 21:18:03 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-01-02 21:33:05 -08:00
2009-08-16 18:25:00 -07:00
2010-08-09 00:45:46 -07:00
2010-08-09 00:45:46 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-08-31 20:59:37 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00