diff options
| author | Peter Maydell | 2015-06-02 11:20:03 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-02 11:20:03 +0200 |
| commit | ef99b3ee065d5c817fa0a50d95293e569bfb47fb (patch) | |
| tree | e4307ccf1c9bd375ad5b43022aa44aaa98543989 /hw/misc/macio/macio.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | acpi: add missing ssdt (diff) | |
| download | qemu-ef99b3ee065d5c817fa0a50d95293e569bfb47fb.tar.gz qemu-ef99b3ee065d5c817fa0a50d95293e569bfb47fb.tar.xz qemu-ef99b3ee065d5c817fa0a50d95293e569bfb47fb.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc build fix
My last pull breaks build on systems with iasl.
Fix this up.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon Jun 1 20:41:08 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
acpi: add missing ssdt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/macio/macio.c')
0 files changed, 0 insertions, 0 deletions