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> ...
No related branches found
No related tags found
Showing
- Documentation/zorro.txt 3 additions, 2 deletionsDocumentation/zorro.txt
- arch/m68k/Kconfig 24 additions, 0 deletionsarch/m68k/Kconfig
- arch/m68k/amiga/chipram.c 1 addition, 1 deletionarch/m68k/amiga/chipram.c
- arch/m68k/amiga/config.c 42 additions, 21 deletionsarch/m68k/amiga/config.c
- arch/m68k/amiga/platform.c 6 additions, 3 deletionsarch/m68k/amiga/platform.c
- arch/m68k/apollo/config.c 14 additions, 12 deletionsarch/m68k/apollo/config.c
- arch/m68k/atari/ataints.c 3 additions, 0 deletionsarch/m68k/atari/ataints.c
- arch/m68k/atari/config.c 6 additions, 4 deletionsarch/m68k/atari/config.c
- arch/m68k/atari/debug.c 4 additions, 1 deletionarch/m68k/atari/debug.c
- arch/m68k/bvme6000/config.c 4 additions, 2 deletionsarch/m68k/bvme6000/config.c
- arch/m68k/configs/amiga_defconfig 39 additions, 11 deletionsarch/m68k/configs/amiga_defconfig
- arch/m68k/configs/apollo_defconfig 39 additions, 10 deletionsarch/m68k/configs/apollo_defconfig
- arch/m68k/configs/atari_defconfig 39 additions, 11 deletionsarch/m68k/configs/atari_defconfig
- arch/m68k/configs/bvme6000_defconfig 39 additions, 9 deletionsarch/m68k/configs/bvme6000_defconfig
- arch/m68k/configs/hp300_defconfig 39 additions, 10 deletionsarch/m68k/configs/hp300_defconfig
- arch/m68k/configs/mac_defconfig 40 additions, 11 deletionsarch/m68k/configs/mac_defconfig
- arch/m68k/configs/multi_defconfig 40 additions, 13 deletionsarch/m68k/configs/multi_defconfig
- arch/m68k/configs/mvme147_defconfig 39 additions, 9 deletionsarch/m68k/configs/mvme147_defconfig
- arch/m68k/configs/mvme16x_defconfig 40 additions, 9 deletionsarch/m68k/configs/mvme16x_defconfig
- arch/m68k/configs/q40_defconfig 39 additions, 11 deletionsarch/m68k/configs/q40_defconfig
Loading
Please register or sign in to comment