tree 9ea5649276c18f13356c4db1663368e071081a25
parent ffaba674090f287afe0c44fd8d978c64c03581a8
parent 81f1adf01224f5c0be5f90f43664f799c1f7bb2d
author David S. Miller <davem@davemloft.net> 1238366662 -0700
committer David S. Miller <davem@davemloft.net> 1238366662 -0700

Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc

Conflicts:
	arch/sparc/kernel/smp_64.c