tree 6e811633baeb676693c493f6c82bf785cab2771d
parent 15f7176eb1cccec0a332541285ee752b935c1c85
parent 65fb0d23fcddd8697c871047b700c78817bdaa43
author Rusty Russell <rusty@rustcorp.com.au> 1238468630 +1030
committer Rusty Russell <rusty@rustcorp.com.au> 1238468630 +1030

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).