| commit | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 17 Mar 2016 08:52:58 +0000 (17 08:52 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 17 Mar 2016 08:52:58 +0000 (17 08:52 +0000) | ||
| tree | b56c2fb353dc23b414f7462744048585787857c4 | treesnapshot (tar.gz zip) |
| parent | 33616ace9f3da93cbc967761a173d96eb744fcda | commitdiff |
| parent | 34294e2f545dae9f020b6d52e3929f4c4e45800c | commitdiff |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging
Machine Core queue, 2016-03-16
# gpg: Signature made Wed 16 Mar 2016 18:57:34 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/machine-pull-request:
module: Rename machine_init() to opts_init()
machine: Use type_init() to register machine classes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Machine Core queue, 2016-03-16
# gpg: Signature made Wed 16 Mar 2016 18:57:34 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/machine-pull-request:
module: Rename machine_init() to opts_init()
machine: Use type_init() to register machine classes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>