Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 22:27:13 +0000 (23:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 22:27:13 +0000 (23:27 +0100)
commit5176e9651bda5182df008a1226e2484fdd809985
tree488ccfab02964862cf5d59b4a7def7b0f63c56f4
parent36eec03211820b5b58795a8ae3521f20cd0285df
parent2b0bb69997c2416e74f41aa1400ce983bf8775c0
Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'

* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
configure

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