tree 6a29f442764bb13dbd6c2abe60e70f9f2cb1961a
parent 79b520e87e1214cfa107bdc8528b5d6c055a8b82
parent 06724535f8fa26e78238bf8adfc9c81650a665f7
author Linus Torvalds <torvalds@linux-foundation.org> 1253206552 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253206552 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: check NB MCE bank enable on the current node properly
  amd64_edac: Rewrite unganged mode code of f10_early_channel_count
  amd64_edac: cleanup amd64_check_ecc_enabled
  x86, EDAC: Provide function to return NodeId of a CPU
  amd64_edac: build driver only on AMD hardware