diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 17:22:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 17:22:50 +0200 |
| commit | 0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a (patch) | |
| tree | 5e576c9cca633f37790effd1a25ec87f515e39de /drivers/net/hplance.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | drm/radeon: Fix sparc regression in r300_scratch() (diff) | |
| download | linux-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.tar.xz linux-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.zip | |
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/net/hplance.c')
0 files changed, 0 insertions, 0 deletions