From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2008 01:25:29 +0000 (-0800)
Subject: Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.29-rc1~567
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a4ba2e9e36d10ace6f5ca222c1ff3e5024d75f1a;p=linux-2.6-omap-h63xx.git

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

* 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/intel: Fix broken ® symbol in device name.
  agp/intel: add support for G41 chipset
---

a4ba2e9e36d10ace6f5ca222c1ff3e5024d75f1a