Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, amd_nb: Enable GART support for AMD family 0x15 CPUs
  x86, amd: Use compute unit information to determine thread siblings
  x86, amd: Extract compute unit information for AMD CPUs
  x86, amd: Add support for CPUID topology extension of AMD CPUs
  x86, nmi: Support NMI watchdog on newer AMD CPU families
  x86, mtrr: Assume SYS_CFG[Tom2ForceMemTypeWB] exists on all future AMD CPUs
  x86, k8: Rename k8.[ch] to amd_nb.[ch] and CONFIG_K8_NB to CONFIG_AMD_NB
  x86, k8-gart: Decouple handling of garts and northbridges
  x86, cacheinfo: Fix dependency of AMD L3 CID
  x86, kvm: add new AMD SVM feature bits
  x86, cpu: Fix allowed CPUID bits for KVM guests
  x86, cpu: Update AMD CPUID feature bits
  x86, cpu: Fix renamed, not-yet-shipping AMD CPUID feature bit
  x86, AMD: Remove needless CPU family check (for L3 cache info)
  x86, tsc: Remove CPU frequency calibration on AMD

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/aperture_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/scattered.c
Simple merge

diff --cc arch/x86/kernel/pci-gart_64.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc drivers/char/agp/amd64-agp.c
index 564808a5c3c06c36434791bafb95c22472c8920a,4d6087c9ec9d3fc366a191a756e391447fd3e28e..42396df555567660d597ac524631e9020edfbea3
--- 1/drivers/char/agp/amd64-agp.c
--- 2/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@@ -195,11 -199,15 +199,15 @@@ static void amd64_cleanup(void
  {
        u32 tmp;
        int i;
-         for (i = 0; i < num_k8_northbridges; i++) {
-               struct pci_dev *dev = k8_northbridges[i];
+ 
+       if (!k8_northbridges.gart_supported)
+               return;
+ 
+       for (i = 0; i < k8_northbridges.num; i++) {
+               struct pci_dev *dev = k8_northbridges.nb_misc[i];
                /* disable gart translation */
                pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &tmp);
 -              tmp &= ~AMD64_GARTEN;
 +              tmp &= ~GARTEN;
                pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, tmp);
        }
  }

diff --cc include/linux/pci_ids.h
Simple merge