* commit '33552a5f':
  arm: Add mathops.h to ARCH_HEADERS list
  avstring: K&R formatting cosmetics

Conflicts:
	libavutil/avstring.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>