Merge commit '37961044c6'
authorClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 18:32:12 +0000 (19:32 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 18:32:12 +0000 (19:32 +0100)
commitf84ece0a9831cbbdc53163eeb81a5d03cd840d70
tree3742df187e442e2db9518e072483c1aac72abd65
parent727c463ff7d8847a5f8ad841e6aac8c61683a145
parent37961044c6cc633c28d87293775d8e985d156921
Merge commit '37961044c6'

* commit '37961044c6':
  checkasm: arm: Ignore changes to bits 0-4 and 7 of FPSCR
  cheackasm/arm: remove NEON instructions from checkasm_checked_call_vfp
  checkasm: arm: Don't start new const blocks for each string

This merge is a noop: the changes were included in 9f1c81e5ec.

Merged-by: Clément Bœsch <u@pkh.me>