From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Apr 2008 16:29:36 +0000 (-0700)
Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.26-rc1~1047
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9c04d678418fe42646de641f499209ca00fd94f;p=linux-2.6

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

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
  agp: fix shadowed variable warning in amd-k7-agp.c
---

d9c04d678418fe42646de641f499209ca00fd94f