diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 11:22:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 11:22:50 -0400 |
| commit | 0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a (patch) | |
| tree | 5e576c9cca633f37790effd1a25ec87f515e39de /drivers/ieee1394/csr1212.h | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
| parent | 88b045077a1462a47503137fd4ca0c31772819ca (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: Fix sparc regression in r300_scratch()
drm: make sure vblank interrupts are disabled at DPMS time
drm/radeon/kms/evergreen: No EnableYUV table
drm/radeon: 9800 SE has only one quadpipe
drm/radeon/kms: don't print error for legal crtcs.
drm/radeon/kms/evergreen: fix LUT setup
Diffstat (limited to 'drivers/ieee1394/csr1212.h')
0 files changed, 0 insertions, 0 deletions