diff options
| author | Peter Maydell | 2014-04-14 15:02:12 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-04-14 15:02:12 +0200 |
| commit | c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e (patch) | |
| tree | 21c31bf2d3c7adaf0cf988e6cd35f5b706237751 /include/exec/memory-internal.h | |
| parent | ide: Correct improper smart self test counter reset in ide core. (diff) | |
| parent | acpi-test: update expected files (diff) | |
| download | qemu-c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e.tar.gz qemu-c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e.tar.xz qemu-c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
acpi: SSDT update
This has a fix by Igor for a regression introduced by
bridge hotplug code.
Expected test files were updated accordingly.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 14 Apr 2014 13:13:35 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-test: update expected files
acpi: fix incorrect encoding for 0x{F-1}FFFF
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory-internal.h')
0 files changed, 0 insertions, 0 deletions