Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 01:51:17 +0000 (03:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 01:51:17 +0000 (03:51 +0200)
commit01fc6533aa4175bad4b926361d017801aff9c53c
treec01a1315b2e41eb376a03436d1040bb0db30005e
parentb4d4f8f8266e6407f21a62110905b27d3d3d71da
parent07d8fa58121be8fe315bd51ab760547fe209a745
Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'

* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
  fate: add informative cpu test

Conflicts:
tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/cpu.c
tests/fate/libavutil.mak