From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9c04d678418fe42646de641f499209ca00fd94f;p=linux-beck.git 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