* commit 'f7cafb5d':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
	doc/APIchanges
	libavutil/version.h

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