From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 17:00:49 +0000 (-0700)
Subject: Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v3.10-rc1~158
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=e2823299cdc140cccd40484d690ab1d90d75b099

Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

Pull edac fixes from Mauro Carvalho Chehab:
 "Two edac fixes:

   - i7300_edac currently reports a wrong number of DIMMs when the
     memory controller is in single channel mode

   - on some Sandy Bridge machines, the EDAC driver bails out as one of
     the PCI IDs used by the driver is hidden by BIOS.  As the driver
     uses it only to detect the type of memory, make it optional at the
     driver"

* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  edac: sb_edac.c should not require prescence of IMC_DDRIO device
  i7300_edac: Fix memory detection in single mode
---

e2823299cdc140cccd40484d690ab1d90d75b099