diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 18:02:31 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 18:02:31 (GMT) |
commit | dcae7f2dfcc6c948c313d72df6a0d7e466c6707a (patch) | |
tree | 0aca1c9397b81ea67f94cf422d5da830f00f5ea3 /arch/x86/oprofile/op_model_p4.c | |
parent | 509768f751986f171710319f44170e7dbab37394 (diff) | |
parent | c46b54f7406780ec4cf9c9124d1cfb777674dc70 (diff) | |
download | linux-fsl-qoriq-dcae7f2dfcc6c948c313d72df6a0d7e466c6707a.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Three kvm related memory management fixes, a fix for show_trace, a fix
for early console output and a patch from Ben to help prevent compile
errors in regard to irq functions (or our lack thereof)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/pci: Implement IRQ functions if !PCI
s390/sclp: fix new line detection
s390/pgtable: make pgste lock an explicit barrier
s390/pgtable: Save pgste during modify_prot_start/commit
s390/dumpstack: fix address ranges for asynchronous and panic stack
s390/pgtable: Fix guest overindication for change bit
Diffstat (limited to 'arch/x86/oprofile/op_model_p4.c')
0 files changed, 0 insertions, 0 deletions