]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 20 Apr 2013 11:38:48 +0000 (11:38 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 20 Apr 2013 11:38:48 +0000 (11:38 +0000)
* 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Correctly restore FPSCR
  target-arm: Add some missing CPU state fields to VMState
  target-arm: port ARM CPU save/load to use VMState
  target-arm: Reinsert missing return statement in ARM mode SRS decode


Trivial merge