diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-08 06:34:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-08 06:34:39 -0800 |
| commit | 6dde39be39e636c1d41e73590668d5903b11535b (patch) | |
| tree | d40ca2fda338ce846697e4123ed7a963595829bb /kernel/timer.c | |
| parent | f8f5d4f11dc7d321fb372b09fc8767069a18bf30 (diff) | |
| parent | 599bbb9de0fe9c494a223a34d790b353ad4d69f8 (diff) | |
| download | linux-6dde39be39e636c1d41e73590668d5903b11535b.tar.gz linux-6dde39be39e636c1d41e73590668d5903b11535b.tar.bz2 linux-6dde39be39e636c1d41e73590668d5903b11535b.zip | |
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/i915: i915 cannot provide switcher services.
drm/radeon/kms: fix vram base calculation on rs780/rs880
drm/radeon/kms: fix formatting of vram and gtt info
drm/radeon/kms: forbid big bo allocation (fdo 31708) v3
drm: Don't try and disable an encoder that was never enabled
drm: Add missing drm_vblank_put() along queue vblank error path
drm/i915/dp: Only apply the workaround if the select is still active
drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo
drm/i915/lvds: Always restore panel-fitter when enabling the LVDS
drm/i915/ringbuffer: Only print an error on the second attempt to reset head
drm/i915: announce to userspace that the bsd ring is coherent
agp/intel: Fix wrong kunmap in i830_cleanup()
drm/i915: Factor in pixel-repeat in FDI M/N calculation
drm/i915: Death to the unnecessary 64bit divide
drm/i915: Clean conflicting modesetting registers upon init
drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI.
drm/i915: Always set the DP transcoder config to 8BPC.
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions