diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-22 19:47:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-22 19:47:37 -0800 |
commit | e819eb8687767cefca7b6abf5ac6d5efcf581eeb (patch) | |
tree | ef40a82ddbce3fe12b4205a87b5195e8e9fbb136 /arch/powerpc/kernel/iomap.c | |
parent | ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f (diff) | |
parent | 0f16830e9f6de0a44cf1e473ffa80cbe612d5beb (diff) | |
download | blackbird-op-linux-e819eb8687767cefca7b6abf5ac6d5efcf581eeb.tar.gz blackbird-op-linux-e819eb8687767cefca7b6abf5ac6d5efcf581eeb.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: Include the connector name in the output_poll_execute() debug message
drm/radeon/kms: fix bug in r600_gpu_is_lockup
drm/radeon/kms: reorder display resume to avoid problems
drm/radeon/kms/evergreen: reset the grbm blocks at resume and init
drm/radeon/kms: fix evergreen asic reset
Revert "drm: Don't try and disable an encoder that was never enabled"
drm/radeon: Add early unregister of firmware fb's
drm/radeon: use aperture size not vram size for overlap tests
drm/radeon/kms/evergreen: flush hdp cache when flushing gart tlb
drm/radeon/kms: disable the r600 cb offset checker for linear surfaces
drm/radeon/kms: disable ss fixed ref divide
drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks
agp/intel: Fix missed cached memory flags setting in i965_write_entry()
drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
drm/i915/ringbuffer: Handle wrapping of the autoreported HEAD
drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI converter
Diffstat (limited to 'arch/powerpc/kernel/iomap.c')
0 files changed, 0 insertions, 0 deletions