]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a93dc4 44a207f)
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Feb 2008 02:29:57 +0000 (18:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Feb 2008 02:29:57 +0000 (18:29 -0800)
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: fix missing casts that produced a warning.
  agp: add support for 662/671 to agp driver
  fix historic ioremap() abuse in AGP
  agp/sis: Suspend support for SiS AGP
  agp/sis: Clear bit 2 from aperture size byte as well

1  2 
arch/x86/mm/ioremap.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/mm/ioremap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.