diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 21:13:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 21:13:48 +0100 |
| commit | 6887dc6700ccb7820d8a9d370f421ee361c748e8 (patch) | |
| tree | 4944492230715be45e1c58bf64eaa1318fe51976 /crypto | |
| parent | f9dada2baabb639feb988b3a564df7a06d214e18 (diff) | |
| parent | cc28a5949bb54df070c38ab505ee2c14385e53d0 (diff) | |
| download | qemu-6887dc6700ccb7820d8a9d370f421ee361c748e8.tar.gz | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170718' into staging
s390: add z14 cpu model
- add a CPU model for the IBM z14 which was announced on July 17th 2017
- update linux headers to 4.13-rc0 to get a fix for an ioctl definition
# gpg: Signature made Tue 18 Jul 2017 09:56:24 BST
# gpg: using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20170718:
s390x/cpumodel: z14 cpu models
linux header sync against v4.13-rc1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions