Merge tag 'edac_fixes_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2016 19:29:23 +0000 (12:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2016 19:29:23 +0000 (12:29 -0700)
commitf2fa30a8b842920896f974010ac4011b8d697566
tree0743819ce5d599ef25cc911850b8c64f623e3ef0
parent694d0d0bb2030d2e36df73e2d23d5770511dbc8d
parentc5b48fa7e298b9a8968a1c1fc0ef013069ca2dd2
Merge tag 'edac_fixes_for_4.8' of git://git./linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "A fix to sb_edac correcting channel reporting on Knights Landing"

* tag 'edac_fixes_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, sb_edac: Fix channel reporting on Knights Landing