git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 397f099 75a9551)
Merge tag 'edac_for_3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp...
authorIngo Molnar <mingo@kernel.org>
Thu, 15 Aug 2013 08:07:20 +0000 (10:07 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 15 Aug 2013 08:07:20 +0000 (10:07 +0200)
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>
1  2 
drivers/edac/amd64_edac.c patch | diff1 | diff2 | blob | history
drivers/edac/edac_mc_sysfs.c patch | diff1 | diff2 | blob | history

diff --cc drivers/edac/amd64_edac.c
Simple merge
diff --cc drivers/edac/edac_mc_sysfs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.