diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 18:22:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 18:22:20 -0700 |
commit | da996f7310eb7fa8d49223936111d3e86b72e2f3 (patch) | |
tree | b8ec16847148b5cd9853a330c6075eea3c94d118 /drivers/rtc/systohc.c | |
parent | 5b4ca4447757019f11a601b0009534ef84bed801 (diff) | |
parent | fa2ce64f85be48003e8c88efcb8c3d7e4d0939ff (diff) | |
download | blackbird-op-linux-da996f7310eb7fa8d49223936111d3e86b72e2f3.tar.gz blackbird-op-linux-da996f7310eb7fa8d49223936111d3e86b72e2f3.zip |
Merge tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull edac updates from Mauro Carvalho Chehab:
"Some fixes and additions to the EDAC driver used on modern Intel x86
CPUs. It includes support for Broadwell EP/EX platforms and fixes for
motherboards with more than 2 CPU sockets"
* tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
sb_edac: support for Broadwell -EP and -EX
sb_edac: Fix support for systems with two home agents per socket
sb_edac: Fix a typo and a thinko in address handling for Haswell
EDAC: Remove arbitrary limit on number of channels
Diffstat (limited to 'drivers/rtc/systohc.c')
0 files changed, 0 insertions, 0 deletions