| commit | 923a789b49c7269a0245d5af6afe486188d940df | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jan 02 22:41:36 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jan 02 22:41:36 2009 +0100 |
| tree | c3f168427372e64f7467a794f313416da5086ba0 | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 [diff] | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed [diff] |
Merge branch 'linus' into x86/cleanups Conflicts: arch/x86/kernel/reboot.c