From: Dave Airlie <airlied@redhat.com>
Date: Sun, 27 Apr 2014 23:15:57 +0000 (+1000)
Subject: Merge branch 'msm-fixes-3.15-rc3' of git://people.freedesktop.org/~robclark/linux... 
X-Git-Tag: v3.15-rc4~24^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9e5e7beb36a0a2299e24f8e7c67f7aba7a87f50c;p=linux.git

Merge branch 'msm-fixes-3.15-rc3' of git://people.freedesktop.org/~robclark/linux into drm-next

Fixes for msm for 3.15.. a memory leak fix for devices using vram
carveout instead of iommu.  Plus I think finally managed to sort out /
workaround some cursor vs underflow issues.  And small fbcon tweak
needed to avoid extra full-modesets at boot.

* 'msm-fixes-3.15-rc3' of git://people.freedesktop.org/~robclark/linux:
  drm/msm/mdp4: cure for the cursor blues (v2)
  drm/msm: default to XR24 rather than AR24
  drm/msm: fix memory leak
---

9e5e7beb36a0a2299e24f8e7c67f7aba7a87f50c