Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ...

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

2008-10-15 11:31:54 +11:00

..

cmm.c

powerpc: Replace __FUNCTION__ with __func__

2008-08-20 16:34:57 +10:00

eeh_cache.c

[POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries

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

eeh_driver.c

powerpc: Guard print_device_node_tree() with #if 0

2008-08-20 16:34:57 +10:00

eeh_event.c

[POWERPC] Rename get_property to of_get_property: arch/powerpc

2007-04-13 03:55:19 +10:00

eeh_sysfs.c

[POWERPC] Show EEH per-device false positives

2007-06-14 22:29:55 +10:00

eeh.c

powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceeded

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

firmware.c

[POWERPC] pseries/firmware.c should include pseries/pseries.h

2008-05-14 22:32:00 +10:00

hotplug-cpu.c

[POWERPC] Split xics_teardown_cpu()

2008-02-07 11:40:19 +11:00

hotplug-memory.c

powerpc: Oops in pseries_lmb_remove()

2008-10-10 15:55:17 +11:00

hvCall_inst.c

[PATCH] mark struct file_operations const 2

2007-02-12 09:48:44 -08:00

hvCall.S

[POWERPC] Bypass hcall stats until cpu features have run

2007-03-22 15:01:43 +11:00

hvconsole.c

[POWERPC] clean up pseries hcall interfaces

2006-08-01 16:19:15 +10:00

hvcserver.c

[PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS

2006-04-01 22:36:57 +11:00

iommu.c

powerpc/pseries: iommu enablement for CMO

2008-07-25 15:44:43 +10:00

Kconfig

powerpc/pseries: Add collaborative memory manager

2008-07-25 15:44:42 +10:00

kexec.c

powerpc/pseries: Call pseries_kexec_setup only on pseries

2008-06-30 22:30:57 +10:00

lpar.c

powerpc: Remove unnecessary condition when sanity-checking WIMG bits

2008-07-15 12:24:59 +10:00

Makefile

powerpc/pseries: Add collaborative memory manager

2008-07-25 15:44:42 +10:00

msi.c

[POWERPC] Read back MSI message in rtas_setup_msi_irqs() so restore works

2007-11-08 14:15:29 +11:00

nvram.c

[POWERPC] Add missing of_node_put in pseries/nvram.c

2008-06-16 15:00:32 +10:00

pci_dlpar.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

2008-04-21 15:58:35 -07:00

pci.c

[POWERPC] Rename get_property to of_get_property: arch/powerpc

2007-04-13 03:55:19 +10:00

phyp_dump.c

[POWERPC] pseries/phyp dump: Reserve a variable amount of space at boot

2008-04-17 07:46:14 +10:00

plpar_wrappers.h

powerpc: Fix CMM page loaning on 64k page kernel with 4k hardware pages

2008-08-18 14:22:35 +10:00

power.c

[POWERPC] Fix warning in pseries/power.c

2008-02-20 13:33:37 +11:00

pseries.h

[POWERPC] Move prototype for find_udbg_vterm() into a header file

2008-04-17 10:00:59 +10:00

ras.c

[POWERPC] Fix sparse warnings in arch/powerpc/platforms/pseries

2008-05-14 22:32:02 +10:00

reconfig.c

powerpc: Check rc of notifier chain for memory remove

2008-09-15 11:07:52 -07:00

rtasd.c

powerpc: Honor O_NONBLOCK flag when reading RTAS log

2008-10-07 14:26:21 +11:00

scanlog.c

[POWERPC] Assign PDE->data before gluing PDE into /proc tree

2008-05-05 16:47:14 +10:00

setup.c

Remove asm/a.out.h files for all architectures without a.out support.

2008-09-06 19:30:24 +01:00

smp.c

powerpc/xics: Consolidate ipi message encode and decode

2008-10-13 16:24:16 +11:00

xics.c

powerpc/xics: Reduce and comment xics IPI use of memory barriers

2008-10-13 16:24:19 +11:00

xics.h

powerpc/xics: Consolidate ipi message encode and decode

2008-10-13 16:24:16 +11:00