From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Feb 2015 02:36:19 +0000 (-0800)
Subject: Merge tag 'edac_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: MMI-PSA29.97-13-9~10697
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ed824a625006e47d2584ee0bba9227a34cc06671;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'edac_for_3.20' of git://git./linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:

 - a new synopsys_edac.c driver for the Synopsys DDR controller, from
   Punnaiah Choudary Kalluri.

 - minor fixes/cleanups all around

 - Mauro and I are adding the repo URLs to MAINTAINERS since people
   asked for trees to base upcoming work on.

* tag 'edac_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Add repo URLs to MAINTAINERS
  EDAC, mv64x60_edac: Fix an error code in probe()
  EDAC: edac_mc_sysfs: Make stuff static
  EDAC: Fix the leak of mci->bus->name when bus_register fails
  edac: i5100_edac: Remove unused i5100_recmema_dm_buf_id
  EDAC, synps: Add EDAC support for zynq ddr ecc controller
  mpc85xx_edac: Fix a typo in comments
  EDAC, mce_amd_inj: Fix sparse non static symbol warning
---

ed824a625006e47d2584ee0bba9227a34cc06671