Phenom Kernel v3.1 and Git Merge fixes