diff options
| author | Peter Maydell | 2016-03-09 01:44:43 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-09 01:44:43 +0100 |
| commit | 3293680dc79c9a4fbbc2bbdd9395a886825a87a2 (patch) | |
| tree | 6ccc40e86ba1cb6d6a0362212c3ecf400708de5c /ui/input-linux.c | |
| parent | Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/rng-for-2.6-2' int... (diff) | |
| parent | tests: update acpi test data (diff) | |
| download | qemu-3293680dc79c9a4fbbc2bbdd9395a886825a87a2.tar.gz qemu-3293680dc79c9a4fbbc2bbdd9395a886825a87a2.tar.xz qemu-3293680dc79c9a4fbbc2bbdd9395a886825a87a2.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw-cfg-20160308-1' into staging
acpi: add fw_cfg device node to dsdt
# gpg: Signature made Tue 08 Mar 2016 11:15:42 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-fw-cfg-20160308-1:
tests: update acpi test data
fw_cfg: document ACPI device node information
acpi: arm: add fw_cfg device node to dsdt
acpi: pc: add fw_cfg device node to dsdt
pc: fw_cfg: move ioport base constant to pc.h
fw_cfg: expose control register size in fw_cfg.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-linux.c')
0 files changed, 0 insertions, 0 deletions