linux/arch/powerpc/platforms
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
..
8xx powerpc/8xx: Add support for the MPC8xx based boards from TQC 2010-08-04 14:25:22 -05:00
40x Remove REDWOOD_[456] config options and conditional code 2010-07-26 09:06:04 -04:00
44x powerpc/44x: Add basic ICON PPC440SPe board support 2010-05-12 07:50:53 -04:00
52xx powerpc/5200: tighten up ac97 reset timing 2010-09-08 11:55:26 -06:00
82xx powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
83xx arch/powerpc/platforms/83xx/mpc837x_mds.c: Add missing iounmap 2010-08-31 16:38:47 -05:00
85xx powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock 2010-08-31 11:41:01 -05:00
86xx Merge commit 'v2.6.35-rc6' into devicetree/next 2010-07-24 09:49:13 -06:00
512x powerpc/512x: fix clk_get() return value 2010-09-01 09:31:06 -06:00
amigaone of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
cell pci: Convert msi to new irq_chip functions 2010-10-12 16:53:34 +02:00
chrp include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
embedded6xx powerpc, memblock: Fix memblock API change fallout 2010-09-11 10:30:28 +02:00
iseries powerpc: Fix bogus it_blocksize in VIO iommu code 2010-08-24 15:26:31 +10:00
maple lmb: rename to memblock 2010-07-14 17:14:00 +10:00
pasemi powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
powermac powerpc/powermac: Drop unnecessary null test 2010-08-24 15:26:28 +10:00
prep powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
ps3 Merge branch 'master' into for-next 2010-08-04 15:14:38 +02:00
pseries pci: Convert msi to new irq_chip functions 2010-10-12 16:53:34 +02:00
fsl_uli1575.c PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 2010-02-23 09:43:31 -08:00
Kconfig powerpc: Fix config dependency problem with MPIC_U3_HT_IRQS 2010-08-24 15:28:29 +10:00
Kconfig.cputype powerpc/47x: Base ppc476 support 2010-05-05 09:11:10 -04:00
Makefile powerpc/85xx: Kconfig cleanup 2009-11-20 16:45:27 -06:00