]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f23e9a 21143b6)
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Mar 2014 17:53:37 +0000 (17:53 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Mar 2014 17:53:37 +0000 (17:53 +0000)
PReP machine and devices

* ppc_rom.bin update and submodule

# gpg: Signature made Wed 12 Mar 2014 17:32:40 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: Update ppc_rom.bin
  Add OpenHack'Ware submodule

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge
QEMU mirror