tree 47a2e80324ab28e346946db1eff058cd4e958988
parent 45dafe98f865895dc4f2a94069b614180f7e01c8
parent c1ae68309b0c1ea67b72e9e94e26b4e819022fc7
author Linus Torvalds <torvalds@linux-foundation.org> 1303843177 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303843177 -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: Erratum #637 workaround
  amd64_edac: Factor in CC6 save area
  amd64_edac: Remove node interleave warning
  EDAC: Remove debugging output in scrub rate handling