Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Dec 2008 01:25:29 +0000 (17:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Dec 2008 01:25:29 +0000 (17:25 -0800)
commita4ba2e9e36d10ace6f5ca222c1ff3e5024d75f1a
tree0d34ce1da0e16cc9c02e4e2f351e5c415822a6c7
parent6de71484cf9561edb45224f659a9db38b6056d5e
parentb854b2ab959e8175d75e01cf8ed452ed2624d0c8
Merge branch 'agp-next' of git://git./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