Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 17:08:08 +0000 (19:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 17:08:32 +0000 (19:08 +0200)
* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
  x86inc: Free up variable name "n" in global namespace

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

Trivial merge