Merge tag 'v3.4.96' into cm-11.0

This is the 3.4.96 stable release

Conflicts:
	arch/arm/mm/proc-v7.S
	drivers/media/dvb/dvb-core/dmxdev.c
	drivers/usb/core/driver.c
	drivers/usb/host/xhci-hub.c
	drivers/usb/host/xhci.c
	drivers/usb/serial/qcserial.c
	drivers/usb/serial/usb_wwan.c
	kernel/futex.c
	mm/memory_hotplug.c
	mm/vmscan.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c

Change-Id: I99e80a6ecf99686fb2cdccf669d0d5c334700826
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.41' into cm-11.0

Conflicts:
	kernel/events/core.c

Change-Id: Ib5962568abc22408a5e4f463ee64d700e1db1b35
msm: perf: Fix compilation

Include perf_trace_counters header file in trace directory to
avoid compile errors when compiling standalone kernel image.

Change-Id: I16204dd596dabdefd2e96b575bf6b8b926f1a028