summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-03-06 05:26:23 +1000
committerDave Airlie <airlied@linux.ie>2008-03-06 05:26:23 +1000
commite00dea812ddb9b483de9f58f7a7aa7105427512d (patch)
tree9ffef663b16a3c444ea9a294d635be4e81e6fe99 /.gitignore
parentf78cdac8e512642db1aaf09bf9178e23ede25586 (diff)
parent12574590cdf7871755d1939463ca6898251fd0d1 (diff)
Merge branch 'master' of ../../drm into modesetting-101
Conflicts: linux-core/drmP.h linux-core/drm_drv.c linux-core/drm_proc.c linux-core/drm_stub.c linux-core/drm_sysfs.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions