* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at>