x86: merge stuff from asm-x86/x86_64/asm_defns.h to asm-x86/asm_defns.h
authorFeng Wu <feng.wu@intel.com>
Tue, 6 May 2014 11:55:27 +0000 (13:55 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 6 May 2014 11:55:27 +0000 (13:55 +0200)
commit74b4f6be24701e323b058149db24ddba1aab5908
tree0432dc07e4feb546ca1a90033b6c645d16a45ad8
parent29f6c57c2372a535b39a6067876fcdd13838c99a
x86: merge stuff from asm-x86/x86_64/asm_defns.h to asm-x86/asm_defns.h

This patch move stuff unchanged from asm-x86/x86_64/asm_defns.h to
asm-x86/asm_defns.h

Signed-off-by: Feng Wu <feng.wu@intel.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/include/asm-x86/asm_defns.h
xen/include/asm-x86/x86_64/asm_defns.h [deleted file]