tree 9e233eb5acf9974bf02de57a9d88c35f86629114
parent a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232
parent ecca0683230b83e8f830ff157911fad20bc43015
author Linus Torvalds <torvalds@linux-foundation.org> 1247890790 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247890790 -0700

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: 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