commit | 174210fe70d34a1ac70b98c1e4412934cbee2061 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Tue May 01 18:46:39 2012 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Tue May 01 18:46:39 2012 -0500 |
tree | 22360abc6aa355df1e73bf0fdc0a449adf618fb3 | |
parent | 725cbc68d0430a8f999256342e300f4f960859cd [diff] | |
parent | 4170aea1a77d7adf9e35ab4d3c17086c38ca6c09 [diff] |
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging * agraf/s390-for-upstream: s390: reset avail and used index on reboot S390: dont call system_shutdown on disabled wait S390: remove default cdrom, sd-card and floppy support S390: support reboot for kvm on s390 S390: reboot: reset device pages on reboot S390: fix error handling on kernel and initrd failures S390: fix kernel_commandline handling