d7fef8549efb24
parent c4814f9001a8dd28e39311a919beac34f778f76d
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180627729 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180627729 -0700

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

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: make sure the drawable code doesn't call malloc(0).
  drm/radeon: add more IGP chipset pci ids
  drm: Spinlock initializer cleanup
³ΊΚ