From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Sep 2012 22:43:36 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5030fcbf0bdcefe8ac2da15bc5be8060b5cb7903;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

Pull EDAC fixes from Mauro Carvalho Chehab:
 "Three edac fixes at the memory enumeration logic:
        - i3200_edac: Fixes a regression at the memory rank size, when the
                memorias are dual-rank;
        - i5000_edac: Fix a longstanding bug when calculating the memory
                size: before Kernel 3.6, the memory size were right only
                with one specific configuration;
        - sb_edac: Fixes a bug since the initial release of the driver:
                with 16GB DIMMs, there's an overflow at the memory size,
                causing the number of pages per dimm (an unsigned value)
                to have the highest bit equal to 1, effectively mangling
                the memory size.

  The third bug can potentially affect the error decoding logic as well."

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: Avoid overflow errors at memory size calculation
  i5000: Fix the memory size calculation with 2R memories
  i3200_edac: Fix memory rank size
---

5030fcbf0bdcefe8ac2da15bc5be8060b5cb7903