Merge commit '257b30af8ec520c1635092e429606c62d3bcca63'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:21:18 +0000 (16:21 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:22:43 +0000 (16:22 +0000)
This commit is a no-op. We already have these, plus our asm differs.

* commit '257b30af8ec520c1635092e429606c62d3bcca63':
  x86: hevc: Fix linking with both yasm and optimizations disabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge