tree 5e779650b210df1a36f9fe5c322b55889fdbb7f9
parent de9e957f12d09793aac7d44ee0f7987dc8019b94
parent 7b37b064c294af350c462f77d7a9a44485a93684
author Linus Torvalds <torvalds@woody.osdl.org> 1167874494 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1167874494 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] drivers/char/agp/sgi-agp.c: check kmalloc() return value
  [AGPGART] Fix PCI-posting flush typo.
  [AGPGART] fix detection of aperture size versus GTT size on G965
  [AGPGART] Remove unnecessary flushes when inserting and removing pages.
  [AGPGART] K8M890 support for amd-k8.