tree 5419ae99fdd48b8fca010c719574afb3656bdd25
parent d0e639c9e06d44e713170031fe05fb60ebe680af
parent dbbfe487e5f3fc00c9fe5207d63309859704d12f
author Linus Torvalds <torvalds@linux-foundation.org> 1381133606 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1381133606 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bux fixes, notable are the regression with ptrace vs
  restarting system calls and the patch for kdump to be able to copy
  from virtual memory"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix system call restart after inferior call
  s390: Allow vmalloc target buffers for copy_from_oldmem()
  s390/sclp: properly detect line mode console
  s390/kprobes: add exrl to list of prohibited opcodes
  s390/3270: fix return value check in tty3270_resize_work()