[FFmpeg-cvslog] Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 18:03:15 2014 +0200| [40285d265906ea6c1d99cfeba64a5a6c1c9d4bd5] | committer: Michael Niedermayer

Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
  aarch64: remove optional :pg_hi21: for adrp instruction

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40285d265906ea6c1d99cfeba64a5a6c1c9d4bd5
---