Merge "msm8974: Remove maxcpus=2 from the kernel command line"