diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 12:22:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 12:22:24 -0500 |
| commit | eda1be631a1efa3985b408a231ba20e1ecf0a92b (patch) | |
| tree | bc44c294343f2b8b142a041baba19b7e314756b1 /drivers/char/defkeymap.map | |
| parent | 5da38d32824eb27c325d296bf3a39b5946578789 (diff) | |
| parent | 0baf823a10bd4131f70e9712d1f02de3c247f1df (diff) | |
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: Move legacy breadcrumb out of the reserved status page area
drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA
drm/radeon: map registers at load time
drm: Remove infrastructure for supporting i915's vblank swapping.
i915: Remove racy delayed vblank swap ioctl.
i915: Don't whine when pci_enable_msi() fails.
i915: Don't attempt to short-circuit object_wait_rendering by checking domains.
i915: Clean up sarea pointers on leavevt
i915: Save/restore MCHBAR_RENDER_STANDBY on GM965/GM45
Diffstat (limited to 'drivers/char/defkeymap.map')
0 files changed, 0 insertions, 0 deletions