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.

diff --combined include/linux/pci_ids.h
index 778e701eff30df2944a84456789387cbacf48ded,5c87cd8a56fd6e72767ee2e742a47dcad0b64ea8..f7a416c52edc9705bc2e7449b9d466da8dd5fea7
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -104,10 -104,6 +104,10 @@@
  #define PCI_CLASS_SERIAL_FIBER                0x0c04
  #define PCI_CLASS_SERIAL_SMBUS                0x0c05
  
 +#define PCI_BASE_CLASS_WIRELESS                       0x0d
 +#define PCI_CLASS_WIRELESS_RF_CONTROLLER      0x0d10
 +#define PCI_CLASS_WIRELESS_WHCI                       0x0d1010
 +
  #define PCI_BASE_CLASS_INTELLIGENT    0x0e
  #define PCI_CLASS_INTELLIGENT_I2O     0x0e00
  
@@@ -1277,6 -1273,7 +1277,7 @@@
  #define PCI_DEVICE_ID_VIA_3296_0      0x0296
  #define PCI_DEVICE_ID_VIA_8363_0      0x0305
  #define PCI_DEVICE_ID_VIA_P4M800CE    0x0314
+ #define PCI_DEVICE_ID_VIA_K8M890CE    0x0336
  #define PCI_DEVICE_ID_VIA_8371_0      0x0391
  #define PCI_DEVICE_ID_VIA_8501_0      0x0501
  #define PCI_DEVICE_ID_VIA_82C561      0x0561