Linus Torvalds d41ad6df44 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ...

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
  powerpc/mpic: Fix mask/unmask timeout message
  powerpc/pseries: Add BNX2=m to defconfig
  powerpc: Enable 64kB pages and 1024 threads in pseries config
  powerpc: Disable mcount tracers in pseries defconfig
  powerpc/boot/dts: Install dts from the right directory
  powerpc: machine_check_generic is wrong on 64bit
  powerpc: Check RTAS extended log flag before checking length
  powerpc: Fix corruption when grabbing FWNMI data
  powerpc: Rework pseries machine check handler
  powerpc: Don't silently handle machine checks from userspace
  powerpc: Remove duplicate debugger hook in machine_check_exception
  powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check
  powerpc: Don't force MSR_RI in machine_check_exception
  powerpc: Print 32 bits of DSISR in show_regs
  powerpc/kdump: Disable ftrace during kexec
  powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler
  powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare
  powerpc/kexec: Don't initialise kexec hooks to default handlers
  powerpc/kdump: Remove ppc_md.machine_crash_shutdown
  powerpc/kexec: Remove ppc_md.machine_kexec
  ...

2011-01-21 13:23:52 -08:00

..

cmm.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dlpar.c

powerpc/pseries: Use kmemdup

2010-10-13 16:19:22 +11:00

dtl.c

powerpc/pseries: Re-enable dispatch trace log userspace interface

2010-09-02 14:07:32 +10:00

eeh_cache.c

powerpc/pseries/eeh: Use for_each_pci_dev()

2010-07-09 11:28:25 +10:00

eeh_driver.c

powerpc/eeh: Fix a bug when pci structure is null

2010-02-17 14:02:47 +11:00

eeh_event.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

eeh_sysfs.c

headers: kobject.h redux

2011-01-10 08:51:44 -08:00

eeh.c

powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG

2010-11-18 14:54:22 +11:00

event_sources.c

powerpc/pseries: Add WARN_ON() to request_event_sources_irqs() on irq allocation/request failure

2010-07-09 11:28:32 +10:00

firmware.c

powerpc: Add VPHN firmware feature

2010-11-29 15:48:22 +11:00

hotplug-cpu.c

powerpc/pseries: Increase cpu die timeout

2010-07-31 15:04:15 +10:00

hotplug-memory.c

powerpc: Fix erroneous lmb->memblock conversions

2010-07-23 12:56:57 +10:00

hvCall_inst.c

powerpc: remove cast from void*

2010-11-03 10:23:26 -04:00

hvCall.S

powerpc: Remove second definition of STACK_FRAME_OVERHEAD

2010-11-29 15:48:23 +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: Pass phb only to iommu_table_setparms_lpar

2010-12-09 15:24:01 +11:00

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

kexec.c

powerpc/kexec: Don't initialise kexec hooks to default handlers

2011-01-21 14:08:35 +11:00

lpar.c

powerpc/pseries: Add kernel parameter to disable batched hcalls

2010-11-29 15:48:18 +11:00

Makefile

powerpc: Add support for new hcall H_BEST_ENERGY

2010-11-29 15:48:19 +11:00

mobility.c

powerpc/pseries: Partition migration in the kernel

2010-10-13 16:19:03 +11:00

msi.c

powerpc/pci: Fix regression in powerpc MSI-X

2009-11-05 17:06:27 +11:00

nvram.c

powerpc/nvram: Rename ppc64,linux partition to ibm,rtas-log

2010-11-30 15:38:50 +11:00

offline_states.h

powerpc: Reset kernel stack on cpu online from cede state

2010-03-09 11:57:10 +11:00

pci_dlpar.c

powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG

2010-11-18 14:54:22 +11:00

pci.c

[POWERPC] Rename get_property to of_get_property: arch/powerpc

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

phyp_dump.c

lmb: rename to memblock

2010-07-14 17:14:00 +10:00

plpar_wrappers.h

powerpc/pseries: Add hcall to read 4 ptes at a time in real mode

2010-05-21 17:31:10 +10:00

power.c

[POWERPC] Fix warning in pseries/power.c

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

pseries_energy.c

powerpc: Add support for new hcall H_BEST_ENERGY

2010-11-29 15:48:19 +11:00

pseries.h

powerpc/pseries: Export device tree updating routines

2010-10-13 16:19:02 +11:00

ras.c

powerpc: Fix corruption when grabbing FWNMI data

2011-01-21 14:08:38 +11:00

reconfig.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

scanlog.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

setup.c

powerpc: Account time using timebase rather than PURR

2010-09-02 14:07:31 +10:00

smp.c

powerpc: Correct smt_enabled=X boot option for > 2 threads per core

2010-08-24 15:26:30 +10:00

suspend.c

suspend: constify platform_suspend_ops

2010-11-16 14:14:02 +01:00

xics.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2010-10-21 21:19:54 -07:00

xics.h

powerpc/xics: Consolidate ipi message encode and decode

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