| commit | fad632092a71bfc098989597b2a17bd8bf16b219 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 11 19:13:16 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 11 19:13:16 2011 -0700 |
| tree | 4b87cb7c3219e1880fdea2d54aaf9f72bb92db6e | |
| parent | b5121290cad7c9e1a786952da4f6d9bfbfb87597 [diff] | |
| parent | 03a80665341bbb9a57064c2ddeca13b554d56893 [diff] |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/nouveau: fix build regression on alpha due to Xen changes. drm/radeon/kms: fix cayman acceleration drm/radeon: fix cayman struct accessors.