1
0
Fork 0
alistair23-linux/arch/powerpc/platforms
Linus Torvalds 5a62f99544 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)
  powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
  powerpc/pseries: Fix VPHN build errors on non-SMP systems
  powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
  powerpc/83xx: add DMA controller to mpc8308 device-tree node
  powerpc/512x: try to free dma descriptors in case of allocation failure
  powerpc/512x: add MPC8308 dma support
  powerpc/512x: fix the hanged dma transfer issue
  powerpc/512x: scatter/gather dma fix
  powerpc/powermac: Make auto-loading of therm_pm72 possible
  of/address: Use propper endianess in get_flags
  powerpc/pci: Use printf extension %pR for struct resource
  powerpc: Remove unnecessary casts of void ptr
  powerpc: Disable VPHN polling during a suspend operation
  powerpc/pseries: Poll VPA for topology changes and update NUMA maps
  powerpc: iommu: Add device name to iommu error printks
  powerpc: Record vma->phys_addr in ioremap()
  powerpc: Update compat_arch_ptrace
  powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
  powerpc/time: printk time stamp init not correct
  powerpc: Minor cleanups for machdep.h
  ...
2011-01-11 16:31:41 -08:00
..
8xx powerpc/8xx: Add support for the MPC8xx based boards from TQC 2010-08-04 14:25:22 -05:00
40x of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
44x powerpc/4xx: Add suspend and idle support 2010-11-29 10:05:06 -05:00
52xx Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2011-01-10 08:57:03 -08:00
82xx powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
83xx of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
85xx of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
86xx Merge commit 'v2.6.35-rc6' into devicetree/next 2010-07-24 09:49:13 -06:00
512x of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
amigaone of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
cell Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-01-11 16:31:41 -08:00
chrp powerpc/nvram: Move things out of asm/nvram.h 2010-11-30 15:09:19 +11:00
embedded6xx powerpc, memblock: Fix memblock API change fallout 2010-09-11 10:30:28 +02:00
iseries powerpc/iseries: Remove unused mf_getSrcHistory function and caller. 2010-11-29 15:48:21 +11:00
maple powerpc/maple: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
pasemi powerpc/pasemi: Clean up pasemi iommu table initializations 2010-11-29 15:48:20 +11:00
powermac powerpc/powermac: Make auto-loading of therm_pm72 possible 2010-12-09 15:36:30 +11: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 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-01-11 16:31:41 -08:00
Kconfig Merge v2.6.37-rc8 into powerpc/next 2010-12-29 22:21:47 -07:00
Kconfig.cputype powerpc/fsl-booke: Add support for FSL 64-bit e5500 core 2010-10-14 00:55:03 -05:00
Makefile powerpc/85xx: Kconfig cleanup 2009-11-20 16:45:27 -06:00
fsl_uli1575.c PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 2010-02-23 09:43:31 -08:00