Merge remote branch 'benh/merge' into benh-next
authorKumar Gala <galak@kernel.crashing.org>
Thu, 19 May 2011 05:36:21 +0000 (00:36 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Thu, 19 May 2011 05:36:21 +0000 (00:36 -0500)
1  2 
arch/powerpc/kernel/smp.c

Simple merge