diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:49:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:49:15 -0400 |
| commit | 78b020d035074fc3aa4d017353bb2c32e2aff56f (patch) | |
| tree | e49922810cfcc880248f588743c619e72f543774 /net | |
| parent | bf5172d07ac38e538e01143289e9b46076494ad5 (diff) | |
| parent | fee7b0d84cc8c7bc5dc212901c79e93eaf83a5b5 (diff) | |
| parent | 5490fa96735ce0e2af270c0868987d644b9a38ec (diff) | |
| parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) | |
Merge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/core