]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/scsi/u14-34f.c
Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 18:50:28 +0000 (10:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 18:50:28 +0000 (10:50 -0800)
commit42cbd8efb0746b55112de45173219f76c54390da
tree3be21847ac861d36897bbb41de9478ddf5142c4d
parentdda5f0a372873bca5f0b1d1866d7784dffd8b675
parentf658bcfb2607bf0808966a69cf74135ce98e5c2d
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
arch/x86/Kconfig
arch/x86/kernel/setup.c
drivers/edac/amd64_edac.c