BLN: ADD BLN, all credit to @tbalden
Merge tag 'v3.4.70' into Torched-linuxupdate

This is the 3.4.70 stable release

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/perf_event.c
	arch/arm/kernel/traps.c
	arch/arm/mm/dma-mapping.c
	drivers/base/power/main.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/gpu/drm/radeon/radeon_mode.h
	drivers/mmc/card/block.c
	drivers/mmc/host/sdhci.c
	drivers/usb/core/message.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/host/xhci.h
	drivers/virtio/virtio_ring.c
	fs/ubifs/dir.c
	include/linux/freezer.h
	include/linux/virtio.h
	include/media/v4l2-ctrls.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	kernel/cgroup.c
	kernel/futex.c
	kernel/signal.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/smp.c
drivers/thermal: Add 3-phase in kernel thermal management

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

Conflicts:
	arch/arm/mach-msm/htc/ville/board-ville.c
	drivers/thermal/msm_thermal.c
	include/linux/msm_thermal.h

Conflicts:
	arch/arm/mach-msm/htc/ville/board-ville.c
msm_thermal: export if we are currently throttled

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
msm_thermal: fix spacing throughout the whole file

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
msm_thermal: add stats for throttling

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
thermal: Fix critical enable/disable bug from STOCK source
This fixes a critical bug which only allowed to disable the thermal guard
but not to re-enable it again. Once disabled the thermal guard would stay
off until rebooted. This allows to re-enable it again. (sysfs)

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Thermal: adjust thermal limits
update defconfig for thermal.
kbuild: drop cpuinit/cpuexit checks in modpost

With the removal of cpuinit/cpuexit we no longer need to
do section mismatch checks on these sections.

Drop it from modpost.

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

Conflicts:
	scripts/mod/modpost.c

Conflicts:
	scripts/mod/modpost.c
Sound Control: Sound control for WCD93xx codec

Fully GPL'ed version.

Signed-off-by: faux123 <reioux@gmail.com>

Conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
sound control: update control offsets for MSM8960 soc

MSM8960 audio connections are slightly different from the APQ8064 for:

speaker control &
camcorder control (possibly stereo in nature where its mono on APQ8064)

Signed-off-by: faux123 <reioux@gmail.com>
enable faux sound control
Sound Control: Added headphone poweramp controls

bump version to 2.1 to reflec this new addition

Signed-off-by: Paul Reioux <reioux@gmail.com>
sound/soc/codecs/wcd9310.c: expose additional controls

Signed-off-by: Paul Reioux <reioux@gmail.com>
sound control 3.x: Initial GPL release for WCD9310 Audio Codec

This is first official GPL release based on my private implementation.

This release has been tested for Mako and Flo officially.  It may work
with other devices using the same WCD9310 Audio Codec as well, but not tested

Signed-off-by: Paul Reioux <reioux@gmail.com>
sound control: wip: change mic gain register

Signed-off-by: Paul Reioux <reioux@gmail.com>
KK-Build #2