From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jun 2012 20:34:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
X-Git-Tag: v3.5-rc4~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02edf6abe01610a5fb379df442de3c837ad99467;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge git://git./linux/kernel/git/mchehab/linux-edac

Pull EDAC fixes from Mauro Carvalho Chehab.

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  edac: Do alignment logic properly in edac_align_ptr()
  mpc85xx_edac: fix error: too few arguments to function 'edac_mc_alloc'
  edac: fix the error about memory type detection on SandyBridge
  edac: avoid mce decoding crash after edac driver unloaded
---

02edf6abe01610a5fb379df442de3c837ad99467