diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-12 11:20:14 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-12 11:20:14 -0500 |
| commit | ae72f3f5391cc761665824eeea542d3c5ad7ca67 (patch) | |
| tree | b466a4171aac3b6aa9ee91a4f20635b166e26638 /linux-user/main.c | |
| parent | 5d9619aa1fc348fe8894553c15c1ec886fa33939 (diff) | |
| parent | fae15286751d8a8209724b14b62d065f1111e621 (diff) | |
| download | focaccia-qemu-ae72f3f5391cc761665824eeea542d3c5ad7ca67.tar.gz focaccia-qemu-ae72f3f5391cc761665824eeea542d3c5ad7ca67.zip | |
Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
* pmaydell/arm-devs.for-upstream: arm_gic: Rename gic_state to GICState zynq_slcr: Fixed ResetValues enum versatilepb: add gpio pl061 support hw/ds1338: Implement state save/restore hw/ds1338: Remove 'now' field from state struct hw/ds1338: Recapture current time when register pointer wraps around hw/ds1338: Fix mishandling of register pointer hw/arm_gic.c: Fix improper DPRINTF output. cadence_ttc: Fix 'clear on read' behavior
Diffstat (limited to 'linux-user/main.c')
0 files changed, 0 insertions, 0 deletions