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
This commit is contained in:
Dave Airlie 2014-01-29 09:35:48 +10:00
commit 5a0abe30be
2 changed files with 11 additions and 3 deletions