From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Oct 2014 02:07:55 +0000 (-0400)
Subject: Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: firefly_0821_release~176^2~3091
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bf65dea87e87c53ba4f97c6432761498bc977efd;p=firefly-linux-kernel-4.4.55.git

Merge tag 'edac/v3.18-rc1' of git://git./linux/kernel/git/mchehab/linux-edac

Pull edac updates from Mauro Carvalho Chehab:
 "Nothing really exiting here: just one bug fix at sb_edac, and some
  changes to allow other drivers to use some shared PCI addresses"

* tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: Claim a different PCI device
  Move Intel SNB device ids from sb_edac to pci_ids.h
  sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel
---

bf65dea87e87c53ba4f97c6432761498bc977efd