| commit | d947090142afc58d22806042d22a68543bc6d41b | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 24 Aug 2011 03:38:21 +0000 (24 13:38 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 24 Aug 2011 03:38:21 +0000 (24 13:38 +1000) | ||
| tree | 0feb93c206d5848487e284a2bd0f21ca500c6a0d | treesnapshot (tar.gz zip) |
| parent | 1c16b4d17f60539e86e9389a521bea6460c496b5 | commitdiff |
| parent | c74040a22704c873388906bc4f26c8e435f4ffbe | commitdiff |
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
| arch/x86/kernel/cpu/mcheck/mce.c | diff1 | diff2 | blobhistory |
| include/linux/edac.h | diff1 | diff2 | blobhistory |