From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Jul 2009 04:19:50 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.31-rc4~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78af08d90b8f745044b1274430bc4bc6b2b27aca;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: Move a dereference below a NULL test
  fb/intelfb: conflict with DRM_I915 and hide by default
  drm/ttm: fix misplaced parentheses
  drm/via: Fix vblank IRQ on VIA hardware.
  drm: drm_gem, check kzalloc retval
  drm: drm_debugfs, check kmalloc retval
  drm/radeon: add some missing pci ids
---

78af08d90b8f745044b1274430bc4bc6b2b27aca