Merge branch 'v9.1.x' into VEX
authorJohn Detter <jdetter@wisc.edu>
Tue, 2 Feb 2016 15:48:47 +0000 (09:48 -0600)
committerJohn Detter <jdetter@wisc.edu>
Tue, 2 Feb 2016 15:48:47 +0000 (09:48 -0600)
commit30e91eaa8b77e37d8ba7811787ba2e6e13e20a2f
treeda186fa6d94ca800f823d348f6cb8fce37dcbcbc
parent6e994e831a9562bfdb4c725b7d11d8c948fab341
parentdf6d090061bae7ff2ba5a6bd57bb2ecbf538ef7a
Merge branch 'v9.1.x' into VEX

Conflicts:
common/src/arch-x86.C
common/h/dyn_regs.h
common/h/entryIDs.h
common/src/arch-x86.C
instructionAPI/src/InstructionDecoder-x86.C