From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 21 Dec 2006 07:59:07 +0000 (-0800)
Subject: Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: upstream/snapshot3+hdmi~36513
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee2fae03d68e702866a8661fbee7ff2f2f3754d7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'drm-patches' of /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
---

ee2fae03d68e702866a8661fbee7ff2f2f3754d7