| commit | 0962f402af1bb0b53ccee626785d202a10c12fff | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Oct 06 16:18:26 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Oct 06 18:06:53 2008 +0200 |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 [diff] | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b [diff] |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1 Conflicts: arch/x86/kernel/process_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>