| commit | c4301c32663438afb8eac96db01944ad95c00260 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 21 07:47:54 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 21 07:47:54 2014 -0700 |
| tree | cc0563cbcdc1c3d136444187211ee13151a28637 | |
| parent | c2661b806092d8ea2dccb7b02b65776555e0ee47 [diff] | |
| parent | d6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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