tree 3be21847ac861d36897bbb41de9478ddf5142c4d
parent dda5f0a372873bca5f0b1d1866d7784dffd8b675
parent f658bcfb2607bf0808966a69cf74135ce98e5c2d
author Linus Torvalds <torvalds@linux-foundation.org> 1294339828 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294339828 -0800

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

* 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, cacheinfo: Cleanup L3 cache index disable support
  x86, amd-nb: Cleanup AMD northbridge caching code
  x86, amd-nb: Complete the rename of AMD NB and related code