[PATCH] x86-64 merge