Linux 3.0.59

Change-Id: I5ff61809fd6771efed8ecdb02aa17e34539f4e68
ion: add hack for HTC IOMMU camera

HTC liboemcamera requests memory from the CAMERA or IOMMU heaps, which
we cannot provide currently. Since we cannot change liboemcamera, remap
to CP_MM heap if CAMERA heap is requested.

Change-Id: I6b965bb56835583c687f0086efcb153c64cf1e25
msm: clock-8960: Change source of DSI escape clock to byte clock

Changing DSI escape clock source from PXO to byte clock to add
flexibilty for customers. They can modify the escape clock by
changing the pinfo divider.

Change-Id: I3ad072fc524fe5fae9695a55bba24ce23b97efc7
CRs-Fixed: 361022
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/clock-8960.c
Revert "power: fbearlysuspend: add sleep hack for CRT-off animation"

This reverts commit eb1844ccd25305284c277f54b97a0fd6502589c6.
Merge "ion: add hack for HTC IOMMU camera" into cm-10.1
Linux 3.0.60

Change-Id: I9d3e94a3830cb37a0b0f457a5d3c0eade9400a75
Signed-off-by: rohan <rohanmathur34@gmail.com>
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	Makefile
	drivers/usb/core/message.c