Merge branch 'intel_ipp'
authorPaul Brossier <piem@piem.org>
Sun, 1 Oct 2017 18:04:30 +0000 (20:04 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 1 Oct 2017 18:04:30 +0000 (20:04 +0200)

Trivial merge