Merge tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Mar 2016 17:29:00 +0000 (09:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Mar 2016 17:29:00 +0000 (09:29 -0800)
commit1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e
tree5c4a34eb46cbf9b8272ad853e6f06e9c77b4db83
parente2857b8f11a289ed2b61d18d0665e05c1053c446
parent83bdaad4d919722744ef1b726a9913ec36c6a430
Merge tag 'edac_fix_for_4.5' of git://git./linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "Last minute fix for sb_edac which fixes DIMM detection on certain Xeon
  Phi configurations:

  A single fix to the Xeon Phi section of sb_edac.  The issue was
  introduced during this merge window"

* tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, sb_edac: Fix logic when computing DIMM sizes on Xeon Phi