Merge commit '206895708ea2b464755d340e44501daf9a07c310'

* commit '206895708ea2b464755d340e44501daf9a07c310':
  x86inc: Remove our FMA4 support

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavresample/x86/audio_mix.asm
Simple merge

diff --cc libavutil/x86/x86inc.asm
Simple merge

diff --cc libavutil/x86/x86util.asm
Simple merge