| commit | c1176d6f03e1085797ce83648a2c76ae15a2b515 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Oct 08 14:03:05 2009 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Oct 08 14:03:05 2009 +1000 |
| tree | f9796cf97a6fbc75a486b1e4f6406d1f8f599a48 | |
| parent | 0eca52a92735f43462165efe00a7e394345fb38e [diff] | |
| parent | d4ac6a05d51357e31028cc9076874a58dd197b83 [diff] |
Merge branch 'drm-next' of ../drm-next into drm-linus conflict in radeon since new init path merged with vga arb code. Conflicts: drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/radeon_device.c