Merge Sony .569

patchset 10/11: Fix some minor mismerges
patchset 12: Merge msm video driver from 569 and caf together
patchset 13: Improve defconfigs (and fix small code misplacement)
patchset 14: Fix booting on JDC panels
patchset 15: Hopefully fix IOMMU page fault
patchset 16: Fix caf mismerge (saw it for hammerhead)

Change-Id: I3045ca8ff86df305448a130c36395171ae3b8f06
kernel_sony_apq8064: Merge Sony 10.4.1.B.0.101 (1/2 general stuff)

Change-Id: Ib487897908e91b547467db24e2b4cc25c2ae390f

Conflicts:
	drivers/video/msm/mipi_dsi_host.c
Patch to 3.4.85

Change-Id: Ia42e008a2d77bcd82d9c882ef7bbe5cfc2a5ef2c

Signed-off-by: daeiron <thomasvangerven@gmail.com>