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

Browse source

...

This commit is contained in:

Dave Airlie 2009-11-06 13:47:54 +10:00

parent 4fe9676d1a a3fa6320ce

commit 6782cc7b61

7 changed files with 272 additions and 65 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

18

drivers/gpu/drm/radeon/r600.c

View file

2

drivers/gpu/drm/radeon/r600_blit_kms.c

View file

79

drivers/gpu/drm/radeon/radeon_atombios.c

View file

162

drivers/gpu/drm/radeon/radeon_combios.c

View file

56

drivers/gpu/drm/radeon/radeon_connectors.c

View file

19

drivers/gpu/drm/radeon/radeon_encoders.c

View file

1

drivers/gpu/drm/radeon/radeon_mode.h

View file