diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-30 14:12:06 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-30 14:12:06 +0200 |
commit | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (patch) | |
tree | c1f762dda525faf24aa10d6f81cf043da202c54f /drivers/edac/i5100_edac.c | |
parent | fa83523f45fbb403eba4ebc5704bf98aa4da0163 (diff) | |
parent | 80f033610fb968e75f5d470233d8d0260d7a72ed (diff) |
Merge branch 'x86/mce' into x86/urgent
Merge in these fixlets.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/edac/i5100_edac.c')
0 files changed, 0 insertions, 0 deletions