Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:40:29 +0000 (19:40 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:40:29 +0000 (19:40 +0200)
commit1c85027afe8dedb1b2940a01da74c09b932df6e7
tree3795f4430b1909607fb65a40221deb27daf414eb
parent3d1b9383b71186de393acee2c644739ba3872907
parent300fb0df84e9a563ed3b8a9b3d365abb6cf34600
Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'

* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
  x86inc: Improve handling of %ifid with multi-token parameters

This commit is a noop, see 4bd5583acea5d65a2f8fd8fcd5ab7b404af23f45

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