Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Jul 2009 04:19:50 +0000 (21:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Jul 2009 04:19:50 +0000 (21:19 -0700)
commit78af08d90b8f745044b1274430bc4bc6b2b27aca
tree9e233eb5acf9974bf02de57a9d88c35f86629114
parenta1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232
parentecca0683230b83e8f830ff157911fad20bc43015
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