tree 2aa33916cb8f1559e2418dd3e9eaf8b6d03f6626
parent 4d9c55e44336602f8b2880b972fb55f67bc51dd0
parent 09aa356b5584090aab6810ec8002936d710cd4ac
author Linus Torvalds <torvalds@linux-foundation.org> 1209227376 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209227376 -0700

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