From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 30 Jan 2007 16:43:26 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
X-Git-Tag: v3.12-rc1~31785
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51e6ed23fc95c3e710d8a98717924ccb2571aa66;p=kernel%2Fkernel-generic.git

Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Add new IDs to VIA AGP.
  [AGPGART] Remove pointless assignment.
  [AGPGART] Remove pointless typedef in ati-agp
  [AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages()
  [AGPGART] intel_agp: restore graphics device's pci space early in resume
---

51e6ed23fc95c3e710d8a98717924ccb2571aa66