tree 424e8f1bdc1daf12ad83a64958156245cd9f1de8
parent d1127e40e8d75cd3855e35424937c73d0bcec558
parent 55eb061326765b2d0489387cfb3fc7dbd244f917
author Linus Torvalds <torvalds@g5.osdl.org> 1143757587 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143757587 -0800

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

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: remove drm_{alloc,free}_pages
  drm: sis fix compile warning
  drm: add new radeon PCI ids..
  drm: read breadcrumb in IRQ handler
  drm: fixup i915 breadcrumb read/write
  drm:  remove pointless checks in radeon_state
  drm: fixup improper cast.
  drm: rationalise some pci ids
  drm: Add general-purpose packet for manipulating scratch registers (r300)
  drm: rework radeon memory map (radeon 1.23)
  drm: update r300 register names
  drm: fixup PCI DMA support