linux-stable/arch/powerpc/platforms/powermac
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
..
backlight.c
bootx_init.c powerpc: Remove trailing space in messages 2010-02-09 13:56:23 +11:00
cache.S
cpufreq_32.c [CPUFREQ] Remove the pm_message_t argument from driver suspend 2011-03-16 17:54:33 -04:00
cpufreq_64.c powerpc/cpumask: Use cpu_online_mask 2010-05-06 17:16:12 +10:00
feature.c powerpc/powermac: Drop unnecessary null test 2010-08-24 15:26:28 +10:00
Kconfig powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
low_i2c.c powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts 2010-07-29 13:24:57 +02:00
Makefile ftrace: rename FTRACE to FUNCTION_TRACER 2008-10-20 18:27:03 +02:00
nvram.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
pci.c powerpc/powermac: Drop unnecessary of_node_put 2010-08-24 15:26:28 +10:00
pfunc_base.c powerpc: Convert feature_lock to raw_spinlock 2010-02-19 14:52:32 +11:00
pfunc_core.c powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
pic.c powerpc: platforms/powermac irq_data conversion. 2011-03-10 11:04:00 +11:00
pic.h powerpc/irq: Convert obsolete hw_interrupt_type to struct irq_chip 2009-03-11 17:11:34 +11:00
pmac.h powerpc: Use common cpu_die (fixes SMP+SUSPEND build) 2010-05-21 17:31:08 +10:00
setup.c powerpc/powermac: Make auto-loading of therm_pm72 possible 2010-12-09 15:36:30 +11:00
sleep.S powerpc/mm: Introduce MMU features 2008-12-21 14:21:16 +11:00
smp.c powerpc: Use common cpu_die (fixes SMP+SUSPEND build) 2010-05-21 17:31:08 +10:00
time.c of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00
udbg_adb.c [POWERPC] Fix section mismatches in udbg_adb.c 2007-08-17 11:02:06 +10:00
udbg_scc.c of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00