diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-03 14:17:26 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-03 14:17:26 -0800 |
| commit | 53addc5d6ef7406d9fab5ea481cf68fa011870f1 (patch) | |
| tree | eb43991923600b5751e04539438e5fffebb61cb3 /linux-core/sis_drv.h | |
| parent | db50f5127421ac8f4e3ce4eb7c27d27475781488 (diff) | |
| parent | ee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff) | |
Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm
Conflicts:
include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
Diffstat (limited to 'linux-core/sis_drv.h')
0 files changed, 0 insertions, 0 deletions