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

Conflicts:
	drivers/bluetooth/hci_ldisc.c
	drivers/usb/dwc3/core.c
	include/linux/sched.h
	net/wireless/nl80211.c
	scripts/tags.sh
	sound/soc/soc-core.c

Change-Id: I0623bb92687b533350d6460fdfd5a0315f7cc1a4