From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Oct 2011 22:43:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v3.2-rc1~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b48aeab65e9fc4b0c9757c5fbc1d722544eb8786;p=platform%2Fkernel%2Flinux-3.10.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Cleanup return type of amd64_determine_edac_cap()
  amd64_edac: Add a fix for Erratum 505
  EDAC, MCE, AMD: Simplify NB MCE decoder interface
  EDAC, MCE, AMD: Drop local coreid reporting
  EDAC, MCE, AMD: Print valid addr when reporting an error
  EDAC, MCE, AMD: Print CPU number when reporting the error
---

b48aeab65e9fc4b0c9757c5fbc1d722544eb8786