Merge commit '543156d7518f5e5d731123da066d86278f9fa492'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 13:01:25 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 13:07:26 +0000 (14:07 +0100)
* commit '543156d7518f5e5d731123da066d86278f9fa492':
  arm: Mark the stack as non-executable

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

Simple merge