Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Oct 2014 14:47:54 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Oct 2014 14:47:54 +0000 (07:47 -0700)
commitc4301c32663438afb8eac96db01944ad95c00260
treecc0563cbcdc1c3d136444187211ee13151a28637
parentc2661b806092d8ea2dccb7b02b65776555e0ee47
parentd6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87
Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull s390 updates from Martin Schwidefsky:
 "One patch to enable the BPF system call and three more bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uprobes: fix kprobes dependency
  s390: wire up bpf syscall
  s390/mm: fixing calls of pte_unmap_unlock
  s390/hmcdrv: Restrict s390 HMC driver to S390 arch