Merge commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 15:30:24 +0000 (17:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:02:42 +0000 (18:02 +0200)
* commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e':
  aarch64: add darwin style PAGE/PAGEOFF relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/aarch64/asm.S

Simple merge