From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 01:51:41 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
X-Git-Tag: v2.6.18-rc1~1113
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfd189a8e944dd0b8135dea2c23ac399bbe34535;p=linux-2.6

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

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] alpha-agp warning fix
  [AGPGART] uninorth-agp warning fixes
  [AGPGART] Remove pointless initialisation in intel-agp
  [AGPGART] Remove pointless code from agp_generic_create_gatt_table()
---

bfd189a8e944dd0b8135dea2c23ac399bbe34535