1
0
Fork 0
alistair23-linux/drivers/macintosh
Linus Torvalds 1b17366d69 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc updates from Ben Herrenschmidt:
 "So here's my next branch for powerpc.  A bit late as I was on vacation
  last week.  It's mostly the same stuff that was in next already, I
  just added two patches today which are the wiring up of lockref for
  powerpc, which for some reason fell through the cracks last time and
  is trivial.

  The highlights are, in addition to a bunch of bug fixes:

   - Reworked Machine Check handling on kernels running without a
     hypervisor (or acting as a hypervisor).  Provides hooks to handle
     some errors in real mode such as TLB errors, handle SLB errors,
     etc...

   - Support for retrieving memory error information from the service
     processor on IBM servers running without a hypervisor and routing
     them to the memory poison infrastructure.

   - _PAGE_NUMA support on server processors

   - 32-bit BookE relocatable kernel support

   - FSL e6500 hardware tablewalk support

   - A bunch of new/revived board support

   - FSL e6500 deeper idle states and altivec powerdown support

  You'll notice a generic mm change here, it has been acked by the
  relevant authorities and is a pre-req for our _PAGE_NUMA support"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (121 commits)
  powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()
  powerpc: Add support for the optimised lockref implementation
  powerpc/powernv: Call OPAL sync before kexec'ing
  powerpc/eeh: Escalate error on non-existing PE
  powerpc/eeh: Handle multiple EEH errors
  powerpc: Fix transactional FP/VMX/VSX unavailable handlers
  powerpc: Don't corrupt transactional state when using FP/VMX in kernel
  powerpc: Reclaim two unused thread_info flag bits
  powerpc: Fix races with irq_work
  Move precessing of MCE queued event out from syscall exit path.
  pseries/cpuidle: Remove redundant call to ppc64_runlatch_off() in cpu idle routines
  powerpc: Make add_system_ram_resources() __init
  powerpc: add SATA_MV to ppc64_defconfig
  powerpc/powernv: Increase candidate fw image size
  powerpc: Add debug checks to catch invalid cpu-to-node mappings
  powerpc: Fix the setup of CPU-to-Node mappings during CPU online
  powerpc/iommu: Don't detach device without IOMMU group
  powerpc/eeh: Hotplug improvement
  powerpc/eeh: Call opal_pci_reinit() on powernv for restoring config space
  powerpc/eeh: Add restore_config operation
  ...
2014-01-27 21:11:26 -08:00
..
ams macintosh/ams: Replace strict_strtoul() with kstrtoul() 2013-08-14 14:57:43 +10:00
Kconfig m68k/mac: Mark Mac IIsi ADB driver BROKEN 2013-12-08 11:01:47 +01:00
Makefile powerpc/windfarm: Fix XServe G5 fan control Makefile issue 2013-11-27 11:35:47 +11:00
adb-iop.c drivers/macintosh/adb-iop.c: flags should be unsigned long 2010-11-12 07:55:30 -08:00
adb.c macintosh/adb: Replace __WAITQUEUE_INITIALIZER with more standard DECLARE_WAITQUEUE. 2013-06-25 17:24:39 +10:00
adbhid.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ans-lcd.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
ans-lcd.h [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 2007-08-22 22:43:29 -05:00
apm_emu.c [POWERPC] apm_emu: Use generic apm-emulation 2007-05-02 16:42:19 +10:00
mac_hid.c macintosh: Convert use of typedef ctl_table to struct ctl_table 2013-07-01 11:10:35 +10:00
macio-adb.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
macio_asic.c drivers: clean-up prom.h implicit includes 2013-10-09 20:04:04 -05:00
macio_sysfs.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
mediabay.c Drivers: macintosh: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
nvram.c drivers: fix up various ->llseek() implementations 2011-07-20 20:47:58 -04:00
rack-meter.c drivers: clean-up prom.h implicit includes 2013-10-09 20:04:04 -05:00
smu.c drivers: clean-up prom.h implicit includes 2013-10-09 20:04:04 -05:00
therm_adt746x.c powerpc/pmac: Convert therm_adt746x to new i2c probing 2012-04-30 15:37:18 +10:00
therm_pm72.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
therm_pm72.h powerpc: Fix G5 thermal shutdown 2010-03-09 11:55:27 +11:00
therm_windtunnel.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
via-cuda.c mac: Make cuda_init_via() __init 2013-07-01 11:10:36 +10:00
via-macii.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
via-maciisi.c m68k/irq: Remove obsolete IRQ_FLG_* users 2011-11-08 22:35:48 +01:00
via-pmu-backlight.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
via-pmu-event.c Input: via-pmu - add input device support 2006-06-26 01:49:55 -04:00
via-pmu-event.h Input: via-pmu - add input device support 2006-06-26 01:49:55 -04:00
via-pmu-led.c powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
via-pmu.c drivers: clean-up prom.h implicit includes 2013-10-09 20:04:04 -05:00
via-pmu68k.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
windfarm.h powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5 2012-04-30 15:37:25 +10:00
windfarm_ad7417_sensor.c Drivers: macintosh: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
windfarm_core.c powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5 2012-04-30 15:37:25 +10:00
windfarm_cpufreq_clamp.c powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5 2012-04-30 15:37:25 +10:00
windfarm_fcu_controls.c Drivers: macintosh: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
windfarm_lm75_sensor.c powerpc/windfarm: Remove superfluous name casts 2013-12-05 16:06:22 +11:00
windfarm_lm87_sensor.c powerpc/windfarm: Add lm87 sensor 2012-04-30 15:37:21 +10:00
windfarm_max6690_sensor.c powerpc/windfarm: Remove superfluous name casts 2013-12-05 16:06:22 +11:00
windfarm_mpu.h powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5 2012-04-30 15:37:25 +10:00
windfarm_pid.c [PATCH] windfarm license fix 2006-03-06 18:40:45 -08:00
windfarm_pid.h [PATCH] powerpc: Thermal control for dual core G5s 2006-02-07 22:05:14 -08:00
windfarm_pm72.c powerpc/windfarm: Use for_each_node_by_type() macro 2013-01-10 17:00:36 +11:00
windfarm_pm81.c powerpc/windfarm: Fix overtemperature clearing 2013-07-01 11:10:34 +10:00
windfarm_pm91.c powerpc/windfarm: Fix overtemperature clearing 2013-07-01 11:10:34 +10:00
windfarm_pm112.c powerpc/windfarm: Use for_each_node_by_type() macro 2013-01-10 17:00:36 +11:00
windfarm_pm121.c powerpc/windfarm: Fix overtemperature clearing 2013-07-01 11:10:34 +10:00
windfarm_rm31.c powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31) 2013-08-01 13:11:47 +10:00
windfarm_smu_controls.c powerpc/windfarm: Remove spurrious sysfs_attr_init() 2012-04-30 15:37:20 +10:00
windfarm_smu_sat.c macintosh/windfarm: Remove obsolete cleanup for clientdata 2013-07-01 11:46:56 +10:00
windfarm_smu_sensors.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00