Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/q40: Enable PC parallel port in defconfig m68k/q40: Undefine insl/outsl before redefining them m68k/uaccess: Fix asm constraints for userspace access swim: Release memory region after incorrect return/goto m68k/irq: Vector ints need a valid interrupt handler m68k/math-emu: unsigned issue, 'unsigned long' will never be less than zero m68k: remove CONFIG_EARLY_PRINTK dependency on CONFIG_EMBEDDED, default to n m68k/sun3: remove inline marking of EXPORT_SYMBOL functions [SCSI] a3000: use module_platform_driver_probe() [SCSI] a4000t: use module_platform_driver_probe() m68k: Remove inline strcpy() and strcat() implementations
Showing
- arch/m68k/Kconfig.debug 1 addition, 2 deletionsarch/m68k/Kconfig.debug
- arch/m68k/configs/multi_defconfig 2 additions, 0 deletionsarch/m68k/configs/multi_defconfig
- arch/m68k/configs/q40_defconfig 6 additions, 0 deletionsarch/m68k/configs/q40_defconfig
- arch/m68k/include/asm/parport.h 2 additions, 0 deletionsarch/m68k/include/asm/parport.h
- arch/m68k/include/asm/string.h 0 additions, 32 deletionsarch/m68k/include/asm/string.h
- arch/m68k/include/asm/uaccess_mm.h 4 additions, 4 deletionsarch/m68k/include/asm/uaccess_mm.h
- arch/m68k/kernel/ints.c 1 addition, 1 deletionarch/m68k/kernel/ints.c
- arch/m68k/lib/Makefile 1 addition, 1 deletionarch/m68k/lib/Makefile
- arch/m68k/lib/string.c 0 additions, 22 deletionsarch/m68k/lib/string.c
- arch/m68k/lib/uaccess.c 3 additions, 3 deletionsarch/m68k/lib/uaccess.c
- arch/m68k/math-emu/fp_arith.c 1 addition, 1 deletionarch/m68k/math-emu/fp_arith.c
- arch/m68k/sun3/sun3dvma.c 1 addition, 1 deletionarch/m68k/sun3/sun3dvma.c
- drivers/block/swim.c 1 addition, 1 deletiondrivers/block/swim.c
- drivers/scsi/a3000.c 1 addition, 12 deletionsdrivers/scsi/a3000.c
- drivers/scsi/a4000t.c 1 addition, 14 deletionsdrivers/scsi/a4000t.c
Loading
Please register or sign in to comment