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
adb.c	macintosh/adb: Replace __WAITQUEUE_INITIALIZER with more standard DECLARE_WAITQUEUE.	2013-06-25 17:24:39 +10:00
adbhid.c
ans-lcd.c
ans-lcd.h
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-adb.c
macio_asic.c	drivers: clean-up prom.h implicit includes	2013-10-09 20:04:04 -05:00
macio_sysfs.c
Makefile	powerpc/windfarm: Fix XServe G5 fan control Makefile issue	2013-11-27 11:35:47 +11:00
mediabay.c
nvram.c
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
therm_pm72.c
therm_pm72.h
therm_windtunnel.c
via-cuda.c	mac: Make cuda_init_via() __init	2013-07-01 11:10:36 +10:00
via-macii.c
via-maciisi.c
via-pmu-backlight.c
via-pmu-event.c
via-pmu-event.h
via-pmu-led.c
via-pmu.c	drivers: clean-up prom.h implicit includes	2013-10-09 20:04:04 -05:00
via-pmu68k.c
windfarm.h
windfarm_ad7417_sensor.c
windfarm_core.c
windfarm_cpufreq_clamp.c
windfarm_fcu_controls.c
windfarm_lm75_sensor.c
windfarm_lm87_sensor.c
windfarm_max6690_sensor.c
windfarm_mpu.h
windfarm_pid.c
windfarm_pid.h
windfarm_pm72.c
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
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
windfarm_smu_sat.c	macintosh/windfarm: Remove obsolete cleanup for clientdata	2013-07-01 11:46:56 +10:00
windfarm_smu_sensors.c