x86: merge include/asm-x86/scatterlist.h