| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Jan 27 12:01:51 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Jan 27 12:01:51 2009 +0100 |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 | |
| parent | 5a611268b69f05262936dd177205acbce4471358 [diff] | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 [diff] |
Merge branch 'linus' into core/percpu Conflicts: arch/x86/kernel/setup_percpu.c