]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Apr 2008 16:29:36 +0000 (09:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Apr 2008 16:29:36 +0000 (09:29 -0700)
commitd9c04d678418fe42646de641f499209ca00fd94f
tree2aa33916cb8f1559e2418dd3e9eaf8b6d03f6626
parent4d9c55e44336602f8b2880b972fb55f67bc51dd0
parent09aa356b5584090aab6810ec8002936d710cd4ac
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