| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 | [log] [tgz] |
|---|---|---|
| author | Rusty Russell <rusty@rustcorp.com.au> | Tue Mar 31 13:33:50 2009 +1030 |
| committer | Rusty Russell <rusty@rustcorp.com.au> | Tue Mar 31 13:33:50 2009 +1030 |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 [diff] | |
| parent | 65fb0d23fcddd8697c871047b700c78817bdaa43 [diff] |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip Conflicts: arch/x86/include/asm/topology.h drivers/oprofile/buffer_sync.c (Both cases: changed in Linus' tree, removed in Ingo's).