diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 18:49:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 18:49:30 +0100 |
| commit | c15d8a6499d04e5d2cac07f8120f207bb275f60f (patch) | |
| tree | 4cde78329a06fdf07e3d780881481d9ae1d021fb /drivers/ide/ide.c | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| parent | drm/i915: convert DRM_ERROR to DRM_DEBUG in phys object pwrite path (diff) | |
| download | linux-c15d8a6499d04e5d2cac07f8120f207bb275f60f.tar.xz linux-c15d8a6499d04e5d2cac07f8120f207bb275f60f.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: convert DRM_ERROR to DRM_DEBUG in phys object pwrite path
drm/i915: make hw page ioremap use ioremap_wc
drm: edid revision 0 is valid
drm: Correct unbalanced drm_vblank_put() during mode setting.
drm: disable encoders before re-routing them
drm: Fix ordering of bit fields in EDID structure leading huge vsync values.
drm: Fix shifts of EDID vsync offset/width fields.
drm/i915: handle bogus VBT panel timing
drm/i915: remove PLL debugging messages
Diffstat (limited to 'drivers/ide/ide.c')
0 files changed, 0 insertions, 0 deletions