tree 4afb2ab7126d2acb6104fd5b1736b9190775070d
parent e4ddc9cc62b40a8b08d02379064d5d8fd78e98bc
parent f9841a8d6018f8bcba77e75c9e368d94f1f22933
author Linus Torvalds <torvalds@woody.osdl.org> 1166687947 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1166687947 -0800

Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: Stop defining pci_pretty_name
  drm: r128: comment aligment with drm git
  drm: make kernel context switch same as for drm git tree.
  drm: fixup comment header style
  drm: savage: compat fix from drm git.
  drm: Unify radeon offset checking.
  i915_vblank_tasklet: Try harder to avoid tearing.
  DRM: handle pci_enable_device failure
  drm: fix return value check