diff options
| author | Peter Maydell | 2018-04-10 13:49:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-10 13:49:07 +0200 |
| commit | daf6b59be8c703264765a533bc63421caef95225 (patch) | |
| tree | 6e6109f272e65866aec4dd87c7b2dc5ad99cf2a4 /hw/arm/aspeed.c | |
| parent | Merge remote-tracking branch 'remotes/xtensa/tags/20180409-xtensa' into staging (diff) | |
| parent | e1000: Old machine types, turn new subsection off (diff) | |
| download | qemu-daf6b59be8c703264765a533bc63421caef95225.tar.gz qemu-daf6b59be8c703264765a533bc63421caef95225.tar.xz qemu-daf6b59be8c703264765a533bc63421caef95225.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 10 Apr 2018 04:36:01 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
e1000: Old machine types, turn new subsection off
e1000: Choose which set of props to migrate
e1000: Migrate props via a temporary structure
e1000: wire new subsection to property
e1000: Dupe offload data on reading old stream
e1000: Convert v3 fields to subsection
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/aspeed.c')
0 files changed, 0 insertions, 0 deletions