linux/arch/powerpc/platforms/ps3
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
..
device-init.c powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc 2009-01-16 16:15:13 +11:00
exports.c [POWERPC] ps3: add lv1 hvcalls 2006-12-04 20:40:44 +11:00
htab.c powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc 2009-01-16 16:15:13 +11:00
hvcall.S [POWERPC] ps3: add lv1 hvcalls 2006-12-04 20:40:44 +11:00
interrupt.c powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc 2009-01-16 16:15:13 +11:00
Kconfig Merge commit 'origin/master' into next 2009-03-24 13:38:30 +11:00
Makefile [POWERPC] PS3: Device registration routines. 2007-06-28 19:16:43 +10:00
mm.c powerpc/cell: Move CBE_IOPTE_* to <asm/cell-regs.h> 2009-08-20 10:29:26 +10:00
os-area.c ps3: Replace direct file operations by callback 2009-06-15 16:47:26 +10:00
platform.h powerpc/cell: Extract duplicated IOPTE_* to <asm/iommu.h> 2009-06-15 13:26:19 +10:00
repository.c powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc 2009-01-16 16:15:13 +11:00
setup.c ps3fb/vram: Extract common GPU stuff into <asm/ps3gpu.h> 2009-06-15 13:26:20 +10:00
smp.c percpu: cleanup percpu array definitions 2009-06-24 15:13:45 +09:00
spu.c powerpc/ps3: The lv1_ routines have u64 parameters 2009-01-16 16:15:12 +11:00
system-bus.c powerpc: use dma_map_ops struct 2009-08-28 14:24:10 +10:00
time.c powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration 2009-08-27 13:25:46 +10:00