Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:08:49 +0000 (09:08 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:08:49 +0000 (09:08 -0700)
commitad360bbbbecc90c654ea1fcd8178366814a9f93a
tree14ff73838c12f61686f6f4367132bcce95660152
parentbc8844ed9b90d348011c31956dd7fef8549efb24
parentc4814f9001a8dd28e39311a919beac34f778f76d
Merge branch 'drm-patches' of ssh:///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