Merge tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into next

Pull EDAC changes from Borislav Petkov:
 "Just two small fixlets.

  We have more in the pipe but we didn't get ready in time so more stuff
  next time"

* tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Fix MC scrub mode comparsion bug for correctable errors
  EDAC, MCE, AMD: Remove leftover unused mask