Git merge fixes - Phenom Kernel v3.5