| commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 13:41:27 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 13:41:27 2008 +0200 |
| tree | 45c4575110c61ca181196c038e1579f0f4fb0174 | |
| parent | 34646bca474142e1424e5f6c4a33cb2ba0930ea1 [diff] | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e [diff] |
Merge branch 'linus' into x86/paravirt-spinlocks Conflicts: arch/x86/kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>