diff options
| author | Dave Airlie | 2014-01-29 09:35:48 +1000 |
|---|---|---|
| committer | Dave Airlie | 2014-01-29 09:35:48 +1000 |
| commit | 5a0abe30bebae3e73bf7808f55b2cd0309fa101d (patch) | |
| tree | 34ca0a1ac75ef8abd0ec774cfadab60a3c9a387d /drivers/video | |
| parent | 76f4f415e502e4dfaf409edd0d4ed0dd3a0a0419 (diff) | |
| parent | 631794b44bd3dbfba37074954d5c584c9e8725f0 (diff) | |
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
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions