Merge tag 'edac_for_3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp...

Pull RAS/EDAC updates from Boris Petkov:

 "An amd64_edac fix for single channel configurations + trivial cleanups
  courtesy of Jingoo Han."

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc drivers/edac/amd64_edac.c
Simple merge

diff --cc drivers/edac/edac_mc_sysfs.c
Simple merge