diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 15:12:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 15:12:52 -0700 |
commit | 241e5e6f0497769d37240215047b9473ae3ae3f0 (patch) | |
tree | e39ac4cd67277804a83ca48749a03a6b2765d52d /arch/microblaze/include/uapi/asm/termios.h | |
parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | m68k: Remove ptrace_signal_deliver (diff) | |
download | linux-dev-241e5e6f0497769d37240215047b9473ae3ae3f0.tar.xz linux-dev-241e5e6f0497769d37240215047b9473ae3ae3f0.zip |
Merge tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- NuBus improvements and cleanups
- defconfig updates
- Fix debugger syscall restart interactions, leading to the global
removal of ptrace_signal_deliver()
* tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Remove ptrace_signal_deliver
m68k/defconfig: Update defconfigs for v4.12-rc1
nubus: Fix pointer validation
nubus: Remove slot zero probe
Diffstat (limited to 'arch/microblaze/include/uapi/asm/termios.h')
0 files changed, 0 insertions, 0 deletions