commit 128283a47e7cc6754db3d2704004c1ed728d26db
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 07 14:54:03 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 07 14:54:03 2011 -0800
tree b3b0db4cd62600776f5e3dd5762798a8bfe793d2
parent 442d1ba237c81304ccfa33887094e843183645f7
parent 6d5db4668796d903dc3bad2852c82073509c37d2

Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/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