Revert "acpu: bump normal oc voltages a bit"

This reverts commit 2aa82242236ed151367a9bbadeced22bbfd093c7.
Revert "acpu: remove 1944 & 1890 Mhz steps and bump voltage for norm on the 2 highest"

This reverts commit 4d57ca9035b7a6b4503ca36a1242c7c559a9af3c.
Revert "acpu/board: lower min constraints further and fix max constraints for cpu uv/ov"

This reverts commit bd3f127a9f1e848ea258d9f9237c1e2777817bef.
Revert "cpu: add & enable overclocking, [read more...]"

This reverts commit 364f7689d2f993584c2c9b5afb610a8a3ba99ed8.

Conflicts:
	arch/arm/mach-msm/Kconfig
Revert "gpu: allow oc up to 450Mhz (this is NOT default)"

This reverts commit f25c6fdb3212dc73c218440d0198fc96a9a10693.

Conflicts:
	arch/arm/mach-msm/clock-8960.c
defconfig: update

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Merge branch 'aosp_new' into aosp

Conflicts:
	Makefile
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/option.c
	drivers/video/console/fbcon.c
	kernel/signal.c
	kernel/time/tick-broadcast.c
	kernel/trace/ftrace.c
	net/core/rtnetlink.c
	net/ipv4/tcp_input.c
	sound/usb/midi.c
defconfig: update

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Revert "msm: acpuclock-8960: allow 192MHz minimum voltage"

This reverts commit f88e750ce16eb83f6c8bb926eb0d82e38717ff9d.
sound/usb/midi.c: fix unused variable 'err'

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix warning: 'ps0_need' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
gpu: allow oc up to 450Mhz (this is NOT default)

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:
	arch/arm/mach-msm/clock-8960.c