| commit | 1e0695cbc814c718763ed93f20711b12c46cfa40 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 22 12:44:22 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 22 12:44:22 2013 -0700 |
| tree | a367fd984ddb5c12e80f8dfd9a41f385d7a19a97 | |
| parent | 51f0885e5415b4cc6535e9cdcc5145bfbc134353 [diff] | |
| parent | 9713faecff3d071de1208b081d4943b002e9cb1c [diff] |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp Pull EDAC fixes from Borislav Petkov: "A fix from Mauro to correct csrow size accounting in sysfs and a sparse fix from Stephen Hemminger." * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Merge mci.mem_is_per_rank with mci.csbased amd64_edac: Correct DIMM sizes EDAC: Make sysfs functions static