* commit 'baa94563fede8959a638b0fa132dd2124acd93e8': ppc: linux: Check altivec using the auxv Conflicts: libavutil/ppc/cpu.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'baa94563fede8959a638b0fa132dd2124acd93e8': ppc: linux: Check altivec using the auxv Conflicts: libavutil/ppc/cpu.c Merged-by: Michael Niedermayer <michaelni@gmx.at>