diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:05:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:05:56 +0300 |
| commit | 4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad (patch) | |
| tree | 8ae6e81fc69fe38db812573a66dc4b3a4d19b5fe /fs | |
| parent | 4a09cbcee49a6f94fa5f56e90b087dfbeb005b77 (diff) | |
| parent | fd2c32a95b10f49d3099188d4d825d9a91e9fe05 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Among the usual minor bug fixes the more interesting patches are the
perf counters for the latest machine, the missing select to enable
transparent huge pages and a build fix for the UAPI rework."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390,uapi: do not use uapi/asm-generic/kvm_para.h
s390/cache: fix data/instruction cache output
s390: fix linker script for 31 bit builds
s390/thp: select HAVE_ARCH_TRANSPARENT_HUGEPAGE
s390/kdump: Use 64 bit mode for 0x10000 entry point
perf_cpum_cf: Add support for counters available with IBM zEC12
s390/css: stop stsch loop after cc 3
s390/cio: use generic bitmap functions
s390/chpid: make headers usable (again)
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions