Linus Torvalds 0a95d92c00 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: (62 commits)
  powerpc/85xx: Fix signedness bug in cache-sram
  powerpc/fsl: 85xx: document cache sram bindings
  powerpc/fsl: define binding for fsl mpic interrupt controllers
  powerpc/fsl_msi: Handle msi-available-ranges better
  drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak
  powerpc/85xx: Fix SPE float to integer conversion failure
  powerpc/85xx: Update sata controller compatible for p1022ds board
  ATA: Add FSL sata v2 controller support
  powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
  powerpc/8xx: remove obsolete mgsuvd board
  powerpc/82xx: rename and update mgcoge board support
  powerpc/83xx: rename and update kmeter1
  powerpc/85xx: Workaroudn e500 CPU erratum A005
  powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x
  powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e
  powerpc/pseries: Disable MSI using new interface if possible
  powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED.
  powerpc: core irq_data conversion.
  powerpc: sysdev/xilinx_intc irq_data conversion.
  powerpc: sysdev/uic irq_data conversion.
  ...

Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of
of_platform_driver in arch/powerpc)

2011-03-18 06:31:43 -07:00

..

cmm.c

powerpc/pseries: Cleanup use of notifier_from_errno()

2011-03-02 16:50:06 +11: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/eeh: Remove one to many l's in the word.

2011-03-02 16:50:25 +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

memory hotplug: Define memory_block_size_bytes for powerpc/pseries

2011-02-03 16:08:57 -08: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: Add support for dynamic dma windows

2011-03-04 18:19:05 +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: Fix hcall tracepoint recursion

2011-02-07 13:06:08 +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/pseries: Disable MSI using new interface if possible

2011-03-11 14:18:24 +11:00

nvram.c

powerpc/pseries/nvram: Capture oops/panic reports in ibm, oops-log partition

2011-03-04 18:19:04 +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/pci: Make both ppc32 and ppc64 use sysdata for pci_controller

2011-02-04 11:46:51 -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

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: platforms/pseries irq_data conversion.

2011-03-10 11:04:01 +11: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

powerpc: platforms/pseries irq_data conversion.

2011-03-10 11:04:01 +11:00

xics.h

powerpc/xics: Consolidate ipi message encode and decode

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