Benjamin Herrenschmidt 9ff9a26b78 Merge commit 'origin/master' into next ...

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

2009-03-30 14:04:53 +11:00

..

spufs

Merge commit 'origin/master' into next

2009-03-30 14:04:53 +11:00

axon_msi.c

powerpc/cell/axon-msi: Fix MSI after kexec

2008-12-16 13:48:18 +11:00

beat_htab.c

powerpc/cell: Use correct types in beat files

2009-01-08 16:25:16 +11:00

beat_hvCall.S

[POWERPC] celleb: Move files for Beat hvcall interfaces

2008-04-24 21:08:13 +10:00

beat_interrupt.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

beat_interrupt.h

[POWERPC] celleb: Move miscellaneous files for Beat

2008-04-24 21:08:14 +10:00

beat_iommu.c

[POWERPC] celleb: Move files for Beat mmu and iommu

2008-04-24 21:08:13 +10:00

beat_smp.c

[POWERPC] celleb: Move miscellaneous files for Beat

2008-04-24 21:08:14 +10:00

beat_spu_priv1.c

[POWERPC] celleb: Move a file for SPU on Beat

2008-04-24 21:08:13 +10:00

beat_syscall.h

[POWERPC] celleb: Move files for Beat hvcall interfaces

2008-04-24 21:08:13 +10:00

beat_udbg.c

powerpc/cell: Use correct types in beat files

2009-01-08 16:25:16 +11:00

beat_wrapper.h

[POWERPC] celleb: Move files for Beat hvcall interfaces

2008-04-24 21:08:13 +10:00

beat.c

[POWERPC] celleb: Move miscellaneous files for Beat

2008-04-24 21:08:14 +10:00

beat.h

[POWERPC] celleb: Move miscellaneous files for Beat

2008-04-24 21:08:14 +10:00

cbe_cpufreq_pervasive.c

powerpc/cell: local_irq_save takes an unsigned long

2009-01-08 16:25:13 +11:00

cbe_cpufreq_pmi.c

cpufreq acpi: only call _PPC after cpufreq ACPI init funcs got called already

2008-07-30 09:41:43 -07:00

cbe_cpufreq.c

powerpc: Fix cpufreq drivers after cpufreq core changes

2009-01-11 21:32:01 -08:00

cbe_cpufreq.h

[CELL] cbe_cpufreq: reorganize code

2007-07-20 21:41:38 +02:00

cbe_powerbutton.c

powerpc/cell: Add support for power button of future IBM cell blades

2008-07-22 10:39:32 +10:00

cbe_regs.c

[POWERPC] cell/cbe_regs.c: Add missing of_node_put

2007-12-20 17:13:51 +11:00

cbe_thermal.c

sysdev: Pass the attribute to the low level sysdev show/store function

2008-07-21 21:55:02 -07:00

celleb_pci.c

[POWERPC] celleb: Add support for PCI Express

2008-04-24 21:08:14 +10:00

celleb_pci.h

[POWERPC] celleb: Add support for PCI Express

2008-04-24 21:08:14 +10:00

celleb_scc_epci.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

celleb_scc_pciex.c

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

celleb_scc_sio.c

[POWERPC] celleb: Move the SCC related code for celleb

2008-04-24 21:08:13 +10:00

celleb_scc_uhc.c

[POWERPC] celleb: Move the SCC related code for celleb

2008-04-24 21:08:13 +10:00

celleb_scc.h

[POWERPC] celleb: Add support for PCI Express

2008-04-24 21:08:14 +10:00

celleb_setup.c

powerpc: Remove default kexec/crash_kernel ops assignments

2008-12-23 15:13:28 +11:00

cpufreq_spudemand.c

powerpc: Fix cpufreq drivers after cpufreq core changes

2009-01-11 21:32:01 -08:00

interrupt.c

sparseirq, powerpc/cell: fix unused variable warning in interrupt.c

2009-03-16 09:21:57 +01:00

interrupt.h

[POWERPC] cell: Add routines for managing PMU interrupts

2006-12-04 20:40:12 +11:00

io-workarounds.c

powerpc: Wire up /proc/vmallocinfo to our ioremap()

2009-03-11 17:10:14 +11:00

io-workarounds.h

[POWERPC] cell: Fix section mismatches in io-workarounds code

2008-05-15 20:49:57 +10:00

iommu.c

powerpc/cell: Fix iommu exception reporting

2009-03-24 13:47:32 +11:00

Kconfig

powerpc/kconfig: Kill PPC_MULTIPLATFORM

2009-03-11 17:11:35 +11:00

Makefile

powerpc/cell: Fix Axon MSI driver dependencies

2009-03-11 17:11:33 +11:00

pervasive.c

powerpc/cell: Cleanup sysreset_hack for IBM cell blades

2008-07-22 10:39:31 +10:00

pervasive.h

powerpc/cell: Cleanup sysreset_hack for IBM cell blades

2008-07-22 10:39:31 +10:00

pmu.c

[POWERPC] cell: Use machine_*_initcall() hooks in platform code

2008-01-17 14:57:15 +11:00

qpace_setup.c

powerpc: setup default archdata for {of_}platform via bus_register_notifier

2009-03-24 13:47:30 +11:00

ras.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

ras.h

[POWERPC] cell: add RAS support

2006-06-21 15:01:29 +10:00

setup.c

powerpc: Remove default kexec/crash_kernel ops assignments

2008-12-23 15:13:28 +11:00

smp.c

powerpc/cell: Fix GDB watchpoints, again

2008-12-01 09:40:18 +11:00

spider-pci.c

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

spider-pic.c

powerpc: Fix irq_alloc_host() reference counting and callers

2008-06-09 13:51:16 +10:00

spu_base.c

cpumask: Use mm_cpumask() wrapper instead of cpu_vm_mask

2009-03-24 13:47:29 +11:00

spu_callbacks.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

spu_fault.c

powerpc/spufs: Use correct return value for spu_handle_mm_fault

2009-02-23 10:48:58 +11:00

spu_manage.c

[POWERPC] Replace remaining __FUNCTION__ occurrences

2008-04-01 20:43:09 +11:00

spu_notify.c

[POWERPC] Oprofile: Remove dependency on spufs module

2007-12-28 15:07:52 +11:00

spu_priv1_mmio.c

cpumask: powerpc: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask

2008-12-26 22:23:39 +10:30

spu_priv1_mmio.h

[POWERPC] cell: abstract spu management routines

2006-12-04 20:40:39 +11:00

spu_syscalls.c

[POWERPC] Oprofile: Remove dependency on spufs module

2007-12-28 15:07:52 +11:00