From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jan 2011 22:54:03 +0000 (-0800)
Subject: Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v2.6.38-rc1~459
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=128283a47e7cc6754db3d2704004c1ed728d26db;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

* 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, MCE: Fix NB error formatting
  EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
  EDAC, MCE: Enable MCE decoding on F15h
  EDAC, MCE: Allow F15h bank 6 MCE injection
  EDAC, MCE: Shorten error report formatting
  EDAC, MCE: Overhaul error fields extraction macros
  EDAC, MCE: Add F15h FP MCE decoder
  EDAC, MCE: Add F15 EX MCE decoder
  EDAC, MCE: Add an F15h NB MCE decoder
  EDAC, MCE: No F15h LS MCE decoder
  EDAC, MCE: Add F15h CU MCE decoder
  EDAC, MCE: Add F15h IC MCE decoder
  EDAC, MCE: Add F15h DC MCE decoder
  EDAC, MCE: Select extended error code mask
---

128283a47e7cc6754db3d2704004c1ed728d26db