From: Dave Airlie <airlied@redhat.com>
Date: Tue, 28 Jan 2014 23:35:48 +0000 (+1000)
Subject: Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next
X-Git-Tag: v3.14-rc1~47^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5a0abe30bebae3e73bf7808f55b2cd0309fa101d;p=linux.git

Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

Only two patches this time around. One trivial and one locking fix.

* 'gma500-next' of git://github.com/patjak/drm-gma500:
  drm/gma500: Lock struct_mutex around cursor updates
  drivers: gpu: Mark function as static in cdv_intel_dp.c
---

5a0abe30bebae3e73bf7808f55b2cd0309fa101d