]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dda5f0a f658bcf)
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)
* '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

1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
arch/x86/kernel/setup.c patch | diff1 | diff2 | blob | history
drivers/edac/amd64_edac.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
diff --cc drivers/edac/amd64_edac.c
Simple merge
XArray, radix tree and IDR