diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-09-08 14:49:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-08 14:49:32 +1000 |
| commit | cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d (patch) | |
| tree | ce46a55f673cd2e669e9ccf625e6101a52138624 /drivers/gpu/drm | |
| parent | c746e205f2fb6f74b4a622382607f065eca5eb49 (diff) | |
| parent | 3ff323f89075624b6891e7c428edb8e8a35be13c (diff) | |
Merge remote branch 'origin/master' of ../linux-2.6 into drm-next
This was a non-trivial merge with some patches sent to Linus
in drm-fixes.
Conflicts:
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv515.c
Diffstat (limited to 'drivers/gpu/drm')
0 files changed, 0 insertions, 0 deletions