diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 18:32:16 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 18:32:16 +0100 |
commit | 16a9189921bdb9e351f2f9baec16b376f8d71cdf (patch) | |
tree | 7cd513137b0ce1ed68a7a9e9a851abc58211d5f0 /hw/misc/zynq_slcr.c | |
parent | ba43bc25c9793ae57d7b5539fecc26015a96107f (diff) | |
parent | d880b28cef4a8b4bc489a5caec201d019b9c0add (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-2' into staging
seabios: update to 1.7.5-rc1
ipxe: update to current git
# gpg: Signature made Thu 15 May 2014 13:29:37 BST 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-roms-2:
ipxe: update to current git
seabios: update to 1.7.5-rc1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/zynq_slcr.c')
0 files changed, 0 insertions, 0 deletions