fixing merge error

Signed-off-by: Bryan Smith <zarboz@gmail.com>
lightsensor: fix broken lightsensor table!

Signed-off-by: Bryan Smith <zarboz@gmail.com>
arch/arm/mach-msm: actually underclock :-P

Signed-off-by: Bryan Smith <zarboz@gmail.com>
arch/arm/mach-msm/ acpuclock Removing: 384mhz step as its been reassigned to 192mhz

Signed-off-by: Bryan Smith <zarboz@gmail.com>