Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
Jesper Nilsson [Thu, 2 Apr 2009 14:02:42 +0000 (16:02 +0200)]
1  2 
arch/cris/arch-v32/kernel/smp.c

Simple merge