diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
| commit | 3a3f39d144c47ce937d6924d344a9ad3d82a2db5 (patch) | |
| tree | 109faf867b2e5774d54fe9499dbfebd3f26f014f /linux-core/xgi_pcie.c | |
| parent | 070755af3fecefb6b09e8ef98738e4926e4148a7 (diff) | |
| parent | 5b86823fa36513f521412a38c240cb18f02dcc9a (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Diffstat (limited to 'linux-core/xgi_pcie.c')
0 files changed, 0 insertions, 0 deletions