Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 4 Jan 2007 01:34:54 +0000 (17:34 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 4 Jan 2007 01:34:54 +0000 (17:34 -0800)
commita7ec3f5289681e9d63b65db5f56857f998812b4b
tree5e779650b210df1a36f9fe5c322b55889fdbb7f9
parentde9e957f12d09793aac7d44ee0f7987dc8019b94
parent7b37b064c294af350c462f77d7a9a44485a93684
Merge /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.
include/linux/pci_ids.h