commit | 5d9c4a7de64d398604a978d267a6987f1f4025b7 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Feb 19 18:29:57 2008 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Feb 19 18:29:57 2008 -0800 |
tree | e15ec482773e28babab19c0edc25bcb90a5f802b | |
parent | 3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1 [diff] | |
parent | 44a207fc66c13c82f627178f9f858b8f3e76028f [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: 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