summaryrefslogtreecommitdiff
path: root/linux-core/sis_drm.h
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-18 13:59:46 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-18 13:59:46 +0100
commit3851600b3450697e20286b1937f3e51397f1965a (patch)
treef7096ebdb05d46bf5ffc6c96a7fa11d570e9caed /linux-core/sis_drm.h
parent315cf14af814da60285adb95238181de430c6f68 (diff)
Fix merge problem.
Diffstat (limited to 'linux-core/sis_drm.h')
0 files changed, 0 insertions, 0 deletions