Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:21:10 +0000 (05:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:21:18 +0000 (05:21 +0100)
* commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0':
  arm: Remove a leftover define for the pld instruction

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

Simple merge