| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Mar 30 23:53:32 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Mar 30 23:53:32 2009 +0200 |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 [diff] | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 [diff] |
Merge branch 'linus' into cpumask-for-linus Conflicts: arch/x86/kernel/cpu/common.c