Merge remote-tracking branch 'origin/nasm-2.13.xx'
commit4dbf3a96a4b17add396ea4592a7fde7cb8083d52
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 20 Feb 2018 20:40:11 +0000 (20 12:40 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 20 Feb 2018 20:40:11 +0000 (20 12:40 -0800)
treef515b64b818a27bddac200cb8428cc47c8297a76
parent99d45c850e3962e4c89839dd8531de1c080b3ee7
parentf71820d6055373c9b9381615e28a28f307bb2df4
Merge remote-tracking branch 'origin/nasm-2.13.xx'

Resolved Conflicts:
version

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
x86/insns.dat