Merge remote-tracking branch 'korg/linux-3.4.y' into cm-12.0

Conflicts:
	drivers/bluetooth/hci_ldisc.c
	drivers/usb/dwc3/core.c
	fs/ext4/namei.c
	include/linux/sched.h
	net/wireless/nl80211.c
	sound/soc/soc-core.c

Change-Id: I6289a40412eb6493400897e56b6f205731a3bd02
Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.7' into cm-12.0

Conflicts:
	drivers/misc/qseecom.c
	fs/proc/task_mmu.c
	include/net/addrconf.h
	include/net/tcp.h
	net/ipv4/syncookies.c
	net/ipv6/addrconf.c
	net/ipv6/ping.c
	net/ipv6/route.c
	net/ipv6/tcp_ipv6.c

Change-Id: Ic403c6aa274d61667dd6f4e758d88a2ef7cdbb46