diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 16:27:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 16:27:06 +0200 |
| commit | 73c6c7fbb74d07a80fee41ce4ca3976547519e42 (patch) | |
| tree | 2c2e2e5c7420054900a491bed70a2c766bd558c9 /drivers/net/wireless/rt2x00 | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | drm/radeon/kms: add FireMV 2400 PCI ID. (diff) | |
| download | linux-73c6c7fbb74d07a80fee41ce4ca3976547519e42.tar.xz linux-73c6c7fbb74d07a80fee41ce4ca3976547519e42.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/kms: add FireMV 2400 PCI ID.
drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET
drivers/gpu/radeon: Add MSPOS regs to safe list.
drm/radeon/kms: disable the tv encoder when tv/cv is not in use
drm/radeon/kms: adjust pll settings for tv
drm/radeon/kms: fix tv dac conflict resolver
drm/radeon/kms/evergreen: don't enable hdmi audio stuff
drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0
drm/radeon/kms: fix rs600 tlb flush
drm/radeon/kms: print GPU family and device id when loading
drm/radeon/kms: fix calculation of mipmapped 3D texture sizes
drm/radeon/kms: only change mode when coherent value changes.
drm/radeon/kms: more atom parser fixes (v2)
Diffstat (limited to 'drivers/net/wireless/rt2x00')
0 files changed, 0 insertions, 0 deletions