diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 01:56:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 01:56:45 +0200 |
commit | 68ffeca4f40dcdfc04e7134b4667e268af6c0683 (patch) | |
tree | e7e9cebac321cbb7074ce665a2de0aa0cd724c0a /drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | |
parent | Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | sb_edac: add support for Haswell based systems (diff) | |
download | linux-68ffeca4f40dcdfc04e7134b4667e268af6c0683.tar.xz linux-68ffeca4f40dcdfc04e7134b4667e268af6c0683.zip |
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull EDAC updates from Mauro Carvalho Chehab.
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
sb_edac: add support for Haswell based systems
sb_edac: Fix mix tab/spaces alignments
edac: add DDR4 and RDDR4
sb_edac: remove bogus assumption on mc ordering
sb_edac: make minimal use of channel_mask
sb_edac: fix socket detection on Ivy Bridge controllers
sb_edac: update Kconfig description
sb_edac: search devices using product id
sb_edac: make RIR limit retrieval per model
sb_edac: make node id retrieval per model
sb_edac: make memory type detection per memory controller
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/dwmac1000.h')
0 files changed, 0 insertions, 0 deletions