summaryrefslogtreecommitdiff
path: root/nouveau
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-12-02 19:40:58 +0100
committerJakob Bornecrantz <jakob@vmware.com>2009-12-02 19:40:58 +0100
commit3bd834a2178ee1273fd84628e87210a500f8fc84 (patch)
treec123835954f8b2733cc72390934125d6d71badd3 /nouveau
parentbe957cc219d0811e2d1ed2a56549a03cb64a0f4b (diff)
parentac5595abc1c28b2c10a1463143e83d17415736f1 (diff)
Merge branch 'modesetting-dirty-libdrm'
Conflicts: include/drm/drm.h
Diffstat (limited to 'nouveau')
0 files changed, 0 insertions, 0 deletions