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)
commit01983e50c0248a3794b345cc0df108752a7c21c8
tree04279fa742da99284f2b03ecec430fa9cb433f0b
parente6aba1be4cb05c8bf56ddfb26e76ea3351237f58
parent7b0c7c9163fe3dd0081696befde28617119d2590
Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'

* commit '7b0c7c9163fe3dd0081696befde28617119d2590':
  arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel

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