| commit | 38f1cff0863809587b5fd10ecd0c24c8b543a48c | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Mar 16 11:34:41 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Mar 16 11:34:41 2011 +1000 |
| tree | 7cf6eb88cdc938c3683209d38311e711a1119400 | |
| parent | 4819d2e4310796c4e9eef674499af9b9caf36b5a [diff] | |
| parent | 5359533801e3dd3abca5b7d3d985b0b33fd9fe8b [diff] |
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next This commit changed an internal radeon structure, that meant a new driver in -next had to be fixed up, merge in the commit and fix up the driver. Also fixes a trivial nouveau merge. Conflicts: drivers/gpu/drm/nouveau/nouveau_mem.c