From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Apr 2011 18:39:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v2.6.39-rc5~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4175242c0dc1d92e821d2b45bc8fe06d4650a7b5;p=thirdparty%2Fkernel%2Flinux.git

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
---

4175242c0dc1d92e821d2b45bc8fe06d4650a7b5