Merge commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 01:14:02 +0000 (03:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 01:14:22 +0000 (03:14 +0200)
* commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f':
  armv6: Accelerate vector_fmul_window

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

Trivial merge