From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 25 Mar 2006 17:17:32 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
X-Git-Tag: v2.6.17-rc1~668
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2e9abdd9bad485970b37cd53a82f92702054984c;p=linux.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets
  [AGPGART] x86_64: Fix wrong PCI ID for ALI M1695 AGP bridge
  [AGPGART] ATI RS350 support.
  [AGPGART] Lots of CodingStyle/whitespace cleanups.
---

2e9abdd9bad485970b37cd53a82f92702054984c