M2: regulators: fixup: make RPM_VREG_ID_PM8921_S2 regulator sleep_selectable

M2: ATT: Increase frequency for RPM_VREG_ID_PM8921_S2 regulator to 2.4

(same as in stock. ATT specific change is forced in rpm-regulator.c)

Change-Id: Ib351f8f75437e85fb50ba166dcaf887fac042df5
M2: msm: simplify ifdefs (no functional change)

I made these before we had a unified "MACH_M2" (thanks invisiblek).
Looks better now.

Change-Id: Ibfd7e22267acb13eea7fc1778994affccbec196d
grrrrr

Change-Id: I5ae0e05618941924e2b1830aed85d945d9072e45
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD