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)
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


Trivial merge