]> git.baikalelectronics.ru Git - kernel.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)
commitf2b1eba4188c9fe83c2f99af238a09d7a1094fb4
tree2aa33916cb8f1559e2418dd3e9eaf8b6d03f6626
parent68317943ad90b8b6bf2da161187ebb6d969d1479
parent033ba3eb7fb4341aacac7c4191c85af2ad7bb8db
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