Commit 9fc81917 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 933a42b1 44c36aed

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -410,9 +410,8 @@ F: drivers/i2c/busses/i2c-ali1563.c 


ALPHA PORT

M:	Richard Henderson <rth@twiddle.net>

S:	Odd Fixes for 2.4; Maintained for 2.6.

M:	Ivan Kokshaysky <ink@jurassic.park.msu.ru>

S:	Maintained for 2.4; PCI support for 2.6.

M:	Matt Turner <mattst88@gmail.com>

L:	linux-alpha@vger.kernel.org

F:	arch/alpha/

arch/alpha/include/asm/topology.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ static const struct cpumask *cpumask_of_node(int node) 
{

	int cpu;



	if (node == -1)

		return cpu_all_mask;



	cpumask_clear(&node_to_cpumask_map[node]);



	for_each_online_cpu(cpu) {