upgrade x86 to 2.6.31.6, resync patches