Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Jun 2014 19:31:14 +0000 (21:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Jun 2014 19:31:18 +0000 (21:31 +0200)
* commit '7b0c7c9163fe3dd0081696befde28617119d2590':
  arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/arm/cpu.c

Simple merge