Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Dec 2012 19:16:37 +0000 (11:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Dec 2012 19:16:37 +0000 (11:16 -0800)
commitb52c6402b5b42620571c36c74a12dcb45ec1e0d6
treef3a63dda44a3bf5d1568ef2d30caee11237c1c78
parent4ba0032984fd2626209c6aef0ee025912875bf9f
parent42709efb3a47524c6252e1bdc85e205f7bc356fb
Merge git://git./linux/kernel/git/mchehab/linux-edac

Pull EDAC fixes from Mauro Carvalho Chehab:
 "One EDAC core fix, and a few driver fixes (i7300, i9275x, i7core)."

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  i7core_edac: fix panic when accessing sysfs files
  i7300_edac: Fix error flag testing
  edac: Fix the dimm filling for csrows-based layouts
  i82975x_edac: Fix dimm label initialization
drivers/edac/edac_mc.c