Merge tag 'edac_fix_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 May 2017 16:18:18 +0000 (09:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 May 2017 16:18:18 +0000 (09:18 -0700)
commitbec6cd63aa0abb0752e3d04daa36e26c08a49315
tree8668bcee35e7e8c87547cbfc7997fff4c340e5bf
parenta95cfad947d5f40cfbf9ad3019575aac1d8ac7a6
parenteb77e6b80f3bed262c7773236f0fb84649fd3091
Merge tag 'edac_fix_for_4.12' of git://git./linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "A single amd64_edac fix correcting chip select sizes reporting on
  F17h"

* tag 'edac_fix_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, amd64: Fix reporting of Chip Select sizes on Fam17h