]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:31:36 +0000 (18:31 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:31:36 +0000 (18:31 -0300)
* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
  checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber

Merged-by: James Almer <jamrial@gmail.com>
1  2 
tests/checkasm/aarch64/checkasm.S

Simple merge