Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm
commit32370db3fb8433259435397c4d60006164c0d198
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 20 Apr 2013 11:38:48 +0000 (20 11:38 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 20 Apr 2013 11:38:48 +0000 (20 11:38 +0000)
tree2bc63cdc11ac73a8483d7742bc4708a1e25ff56b
parent87885c8e57db38669dad2aa1a83577fe95f481be
parente91f229a253f489f6d12b946ad7bdcdc158c5b67
Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm

* '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