Merge branch 'drm-next' of ../drm-2.6 into drm-next

Browse source

...

This commit is contained in:

Dave Airlie 2009-11-05 08:28:54 +10:00

parent 273fad2b82 e29649db3b

commit 4fe9676d1a

7 changed files with 50 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

drivers/gpu/drm/radeon/r100.c

View file

56

drivers/gpu/drm/radeon/r600.c

View file

3

drivers/gpu/drm/radeon/radeon_bios.c

View file

6

drivers/gpu/drm/radeon/radeon_ttm.c

View file

2

drivers/gpu/drm/radeon/rv515.c

View file

26

drivers/gpu/drm/radeon/rv770.c

View file

1

drivers/gpu/drm/ttm/ttm_tt.c

View file