diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 18:36:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 18:36:19 -0800 |
| commit | ed824a625006e47d2584ee0bba9227a34cc06671 (patch) | |
| tree | 1f86ad02241da5b61f112833d37a6a814008cc0b /MAINTAINERS | |
| parent | e07e0d4cb0c4bfe822ec8491cc06269096a38bea (diff) | |
| parent | 7a85951692eb133f20ae93b48494322837b9d1f5 (diff) | |
Merge tag 'edac_for_3.20' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d66a97dd3a12..26557b74a8ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1586,6 +1586,7 @@ N: xilinx F: drivers/clocksource/cadence_ttc_timer.c F: drivers/i2c/busses/i2c-cadence.c F: drivers/mmc/host/sdhci-of-arasan.c +F: drivers/edac/synopsys_edac.c ARM SMMU DRIVER M: Will Deacon <will.deacon@arm.com> @@ -3513,6 +3514,8 @@ M: Borislav Petkov <bp@alien8.de> M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net +T: git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +T: git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next S: Supported F: Documentation/edac.txt F: drivers/edac/ |