diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-13 14:52:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-13 14:52:06 +0000 |
| commit | f673e70ccc668607620cd6d30fd0b9bc7a54151d (patch) | |
| tree | a2f5e596d4e2fba948b1d02ecdb689ff8f86e094 /linux-headers | |
| parent | 9d74f6fef0801ca2ce5c9d38d59b85bf03c27669 (diff) | |
| parent | ea81ce06a4d65c62cd8f2a3797953602fb7d7456 (diff) | |
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging
PReP machine and devices
* Cleanups for Raven PCI host bridge
* Removal of PReP machine and devices from qemu-system-ppcemb
# gpg: Signature made Mon 10 Feb 2014 16:19:03 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/prep-for-upstream:
prep: Drop from ppcemb-softmmu
raven: Use constant PCI_NUM_PINS instead of 4
prep: Kill get_system_io() usage
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers')
0 files changed, 0 insertions, 0 deletions