| commit | b48aeab65e9fc4b0c9757c5fbc1d722544eb8786 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 30 15:43:32 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 30 15:43:32 2011 -0700 |
| tree | 0bfce428f067ca9cf06d971ba8795ad69ca610e2 | |
| parent | 1bc87b00556e8f7ba30a1010471951c5b8f71114 [diff] | |
| parent | 1f6189ed18cbd99d90bffdbc76c3adc54418b2fd [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Cleanup return type of amd64_determine_edac_cap() amd64_edac: Add a fix for Erratum 505 EDAC, MCE, AMD: Simplify NB MCE decoder interface EDAC, MCE, AMD: Drop local coreid reporting EDAC, MCE, AMD: Print valid addr when reporting an error EDAC, MCE, AMD: Print CPU number when reporting the error