merge intel x86 patches into gingerbread branch