diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 15:48:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 15:48:32 +0100 |
| commit | 895b810c1220fff7fb5cca5c428b881b6e30f0ac (patch) | |
| tree | 2a00789a37e93abe2cf8399555cab0e6b6771c71 /hw/i386/bios-linker-loader.c | |
| parent | 19f377299518d4f68b2b9e983d90bd1382da0460 (diff) | |
| parent | ac20e1bb0e77cdf79c6e3f90ff910a46d8ca04c9 (diff) | |
| download | qemu-895b810c1220fff7fb5cca5c428b881b6e30f0ac.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141015-2' into staging
usb: add high speed mouse & keyboard configuration
* remotes/kraxel/tags/pull-usb-20141015-2:
xhci: remove dead code
usb-hid: Add high speed keyboard configuration
usb-hid: Add high speed mouse configuration
usb-hid: Move descriptor decision to usb-hid initfn
Conflicts:
include/hw/i386/pc.h
[Fixed trivial merge conflict in the pc-2.1 property list]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/bios-linker-loader.c')
0 files changed, 0 insertions, 0 deletions