Merge branch 'korg/linux-3.4.y' of git://codeaurora.org/quic/la/kernel/msm into cm-10.2-next

* kang d2 net/bluetooth to fix conflicts

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/traps.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/vfpmodule.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/net/tun.c
	drivers/usb/core/hub.c
	drivers/usb/core/message.c
	drivers/usb/host/xhci.h
	fs/ubifs/dir.c
	include/linux/freezer.h
	include/linux/sched.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	kernel/cgroup.c
	kernel/futex.c
	kernel/power/suspend.c
	kernel/signal.c
	mm/madvise.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

Change-Id: Ic5dff9d68aabd27bb2698ae8f78fc7fd855b8faf
msm8x60: fix build from 3.4 merge

Change-Id: I19336d89afde08f9ab9085794dde91010e2d9441