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

Conflicts:
	net/bluetooth/hci_event.c

Change-Id: I466723b4dc0387a97b2083cd8363ff86a12e30ec
Merge remote-tracking branch 'cm2/cm-11.0' into cm-11.0
Revert "Revert "Revert "msm: msm_bus: Fix the type error causing bandwidth overflow"""

This reverts commit d3208d2349f8a3d14cac93c57d3c7becab7afd50.