| commit | d9c04d678418fe42646de641f499209ca00fd94f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 26 09:29:36 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 26 09:29:36 2008 -0700 |
| tree | 2aa33916cb8f1559e2418dd3e9eaf8b6d03f6626 | |
| parent | 4d9c55e44336602f8b2880b972fb55f67bc51dd0 [diff] | |
| parent | 09aa356b5584090aab6810ec8002936d710cd4ac [diff] |
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