Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 7 May 2010 01:29:25 +0000 (11:29 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 7 May 2010 01:29:25 +0000 (11:29 +1000)
1  2 
arch/powerpc/mm/numa.c
drivers/misc/Makefile

Simple merge
Simple merge