]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 20:34:25 +0000 (13:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 20:34:25 +0000 (13:34 -0700)
commit02edf6abe01610a5fb379df442de3c837ad99467
treed322fffef09896d3354870655d975f2b4d98d0ac
parent67f5d06d732f591449a48242d40928f59d39287d
parent8447c4d15e357a458c9051ddc84aa6c8b9c27000
Merge git://git.kernel.org/pub/scm/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