tree 01f5f907ceaba5daaf3509b0a051dd8c76339271
parent 03ff09580ef6cbc4a893b6e3e6bbff33180ec70a
parent 82845826e89fdc02f6f000fca5d5019ec9be4ab3
author Blue Swirl <blauwirbel@gmail.com> 1311193381 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1311193381 +0000

Merge branch 'for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm

* 'for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Fix BASEPRI, BASEPRI_MAX, and FAULTMASK access
  target-arm: Minimal implementation of performance counters
  Revert "Makefile.target: Allow target helpers to be in any *_helper.c file"
  Revert "target-arm: Use global env in neon_helper.c helpers"
  target-arm: Pass fp status pointer explicitly to neon fp helpers
  target-arm: Make VFP binop helpers take pointer to fpstatus, not CPUState
  target-arm: Add helper function to generate code to get fpstatus pointer
  Revert "target-arm: Use global env in iwmmxt_helper.c helpers"

Conflicts:
	Makefile.target