Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:40:49 +0000 (19:40 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:40:49 +0000 (19:40 +0200)
* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
  x86inc: Enable AVX emulation in additional cases

This commit is a noop, see e428f3b30cebbc2beafb3ff2972dbf8b47bc4a70

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

Trivial merge