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