2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
linux-next/drivers/macintosh
Linus Torvalds 8cf7a16ee9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
 - Zorro bus cleanups and UAPI revival
 - Bootinfo cleanups and UAPI revival
 - Kexec support
 - Memory size reductions and bug fixes for multi-platform kernels
 - Polled interrupt support for Atari EtherNAT, EtherNEC and NetUSBee
 - Machine-specific random_get_entropy()
 - Defconfig updates and cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (46 commits)
  m68k/mac: Make SCC reset work more reliably
  m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts
  m68k: Update defconfigs for v3.13-rc1
  m68k/defconfig: Enable EARLY_PRINTK
  m68k/mm: kmap spelling/grammar fixes
  m68k: Convert arch/m68k/kernel/traps.c to pr_*()
  m68k: Convert arch/m68k/mm/fault.c to pr_*()
  m68k/mm: Check for mm != NULL in do_page_fault() debug code
  m68k/defconfig: Disable /sbin/hotplug fork-bomb by default
  m68k/atari: Hide RTC_PORT() macro from rtc-cmos
  m68k/amiga,atari: Fix specifying multiple debug= parameters
  m68k/defconfig: Use ext4 for ext2/ext3 file systems
  m68k: Add support to export bootinfo in procfs
  m68k: Add kexec support
  m68k/mac: Mark Mac IIsi ADB driver BROKEN
  m68k/amiga: Provide mach_random_get_entropy()
  m68k: Add infrastructure for machine-specific random_get_entropy()
  m68k/atari: Call paging_init() before nf_init()
  m68k: Remove superfluous inclusions of <asm/bootinfo.h>
  m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>
  ...
2014-01-20 09:24:31 -08:00
..
ams macintosh/ams: Replace strict_strtoul() with kstrtoul() 2013-08-14 14:57:43 +10: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
Kconfig m68k/mac: Mark Mac IIsi ADB driver BROKEN 2013-12-08 11:01:47 +01:00
mac_hid.c macintosh: Convert use of typedef ctl_table to struct ctl_table 2013-07-01 11:10:35 +10: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
macio-adb.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
Makefile powerpc/windfarm: Fix XServe G5 fan control Makefile issue 2013-11-27 11:35:47 +11: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-pmu68k.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
via-pmu-backlight.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
via-pmu-event.c
via-pmu-event.h
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
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: Use module_i2c_driver to simplify the code 2012-11-15 12:59:30 +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: Use module_i2c_driver to simplify the code 2012-11-15 12:59:30 +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
windfarm_pid.h
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
windfarm.h powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5 2012-04-30 15:37:25 +10:00