Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: cpumask_of_node() should handle -1 as a node
alpha: add myself as a maintainer, and drop mention of 2.4

MAINTAINERS

···
 
 ALPHA PORT
 M:	Richard Henderson <[e-mail]>
-S:	Odd Fixes for 2.4; Maintained for 2.6.
 M:	Ivan Kokshaysky <[e-mail]>
-S:	Maintained for 2.4; PCI support for 2.6.
+M:	Matt Turner <[e-mail]>
 L:	[e-mail]
 F:	arch/alpha/
 

arch/alpha/include/asm/topology.h

···
 {
 	int cpu;
 
+	if (node == -1)
+		return cpu_all_mask;
+
 	cpumask_clear(&node_to_cpumask_map[node]);
 
 	for_each_online_cpu(cpu) {