| commit | 28638ea4f8adb63f837e4436560ab16ab0388587 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Jun 16 10:17:15 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Jun 16 10:17:15 2008 +0200 |
| tree | 2dab7a03d7696697c82ba62a03700d3a2f3639b1 | |
| parent | f781b03c4b1c713ac000877c8bbc31fc4164a29b [diff] | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 [diff] |
Merge branch 'linus' into x86/nmi Conflicts: arch/x86/kernel/nmi_32.c