| commit | ac3cbc811f2d92dc496d9da1d58ff60598278d7d | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 31 Aug 2011 03:08:31 +0000 (31 13:08 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 31 Aug 2011 03:08:31 +0000 (31 13:08 +1000) | ||
| tree | 328b927d5220aff95f4077fce2e831fe85cef924 | treesnapshot (tar.gz zip) |
| parent | e1cbdf3de51b57158619c3fb272df48b44732f01 | 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 |