projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67f5d06 8447c4d)
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)
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


Trivial merge
John Crispins staging tree