* commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1': ppc: dsputil: comment formatting and wording/grammar improvements Conflicts: libavcodec/ppc/gmc_altivec.c libavcodec/ppc/idct_altivec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1': ppc: dsputil: comment formatting and wording/grammar improvements Conflicts: libavcodec/ppc/gmc_altivec.c libavcodec/ppc/idct_altivec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>