From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 7 May 2007 19:24:07 +0000 (-0700)
Subject: Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.22-rc1~821
X-Git-Url: http://git.rot13.org/?p=powerpc.git;a=commitdiff_plain;h=5f757f91e70a97eda8f0cc13bddc853209b2d173

Merge branch 'drm-patches' of /linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: Add 965GM pci id update
  drm: just use io_remap_pfn_range on all archs..
  drm: fix DRM_CONSISTENT mapping
  drm: fix up mmap locking in preparation for ttm changes
  drm: fix driver deadlock with AIGLX and reclaim_buffers_locked
  drm: fix warning in drm_fops.c
  drm: allow for more generic drm ioctls
  drm: fix alpha domain handling
  via: fix CX700 pci id
  drm: make drm_io_prot static.
  drm: remove via_mm.h
  drm: add missing NULL assignment
  drm/radeon: Fix u32 overflows when determining AGP base address in card space.
  drm: port over use_vmalloc code from git hashtab
  drm: fix crash with fops lock and fixup sarea/page size locking
  drm: bring bufs code from git tree.
  drm: move protection stuff into separate function
  drm: Use ARRAY_SIZE macro when appropriate
  drm: update README.drm (bugzilla #7933)
  drm: remove unused exports
---

5f757f91e70a97eda8f0cc13bddc853209b2d173