1
0
Fork 0
alistair23-linux/arch/powerpc/platforms
Linus Torvalds 723e9db7a4 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: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c
2009-09-15 09:51:09 -07:00
..
8xx powerpc/cpm: Remove some cruft code and defines 2009-05-19 00:47:19 -05:00
40x powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC 2009-08-31 09:15:51 -04:00
44x powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support. 2009-08-31 08:24:15 -04:00
52xx powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function 2009-06-17 00:30:22 -06:00
82xx powerpc/82xx: Add CPM USB Gadget support for MPC8272ADS boards 2009-08-25 09:44:06 -05:00
83xx powerpc/83xx: Add eSDHC support for MPC837xE-RDB/WLAN boards 2009-08-20 10:27:51 +10:00
85xx powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops 2009-09-11 11:27:57 +10:00
86xx powerpc: Remove swiotlb_pci_dma_ops 2009-08-28 14:24:09 +10:00
512x powerpc/5121: make clock debug output more readable 2009-06-17 01:24:10 -06:00
amigaone powerpc/amigaone: Convert amigaone_init() to a machine_device_initcall() 2009-08-20 10:12:21 +10:00
cell powerpc: use dma_map_ops struct 2009-08-28 14:24:10 +10:00
chrp powerpc: Use one common impl. of RTAS timebase sync and use raw spinlock 2009-06-26 16:55:25 +10:00
embedded6xx Merge commit 'origin/master' into next 2009-03-24 13:38:30 +11:00
iseries powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline 2009-09-11 16:01:15 +10:00
maple edac: cpc925 MC platform device setup 2009-06-18 13:03:57 -07:00
pasemi powerpc: ARRAY_SIZE changes in pasemi and powermac code 2009-08-20 10:29:23 +10:00
powermac powerpc: Fix some late PowerMac G5 with PCIe ATI graphics 2009-09-02 16:20:42 +10:00
prep powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
ps3 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2009-09-15 09:51:09 -07:00
pseries powerpc: Fix bug where perf_counters breaks oprofile 2009-09-11 11:27:58 +10:00
Kconfig powerpc/virtex: Add support for Xilinx PCI host bridge 2009-06-06 10:14:22 -06:00
Kconfig.cputype powerpc: Remaining 64-bit Book3E support 2009-08-20 10:25:11 +10:00
Makefile powerpc: Add configurable -Werror for arch/powerpc 2009-06-16 14:15:45 +10:00
fsl_uli1575.c powerpc/85xx: Add P2020DS board support 2009-05-19 00:50:43 -05:00