summaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-20 10:15:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-20 10:15:33 -0700
commitb19a42e3cb9e73cad59e60ab7403e5afe7f4b262 (patch)
tree5b8ebea37f8d655abdfcab89647e118686dc29e8 /arch/mips/cavium-octeon
parent5ca08a82a75c9109f8207cbcbef8705334b4713a (diff)
parent80ed156a3d12819a8c839f40f5b6996c4aa117a5 (diff)
downloadlinux-b19a42e3cb9e73cad59e60ab7403e5afe7f4b262.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky: "The big thing in this second merge for s390 is the new eBPF JIT from Michael which replaces the old 32-bit backend. The remaining commits are bug fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/pci: add locking for fmb access s390/pci: extract software counters from fmb s390/dasd: Fix unresumed device after suspend/resume having no paths s390/dasd: fix unresumed device after suspend/resume s390/dasd: fix inability to set a DASD device offline s390/mm: Fix memory hotplug for unaligned standby memory s390/bpf: Add s390x eBPF JIT compiler backend s390: Use bool function return values of true/false not 1/0
Diffstat (limited to 'arch/mips/cavium-octeon')
0 files changed, 0 insertions, 0 deletions