* commit 'cf7a2167':
  arm: dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/arm/dsputil_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>