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)
commit1ed31d6db90d51010545921e59d369d2f92b7ac2
tree358a0b346bc8135cd5e53700eb44308b1a7c8c5b
parentceba1abcb00b0ef0b1efcd715285f6e05523edef
parent722154e4cacf015161efe60009ae9be23d492296
Merge commit 'origin/master' into next
arch/powerpc/mm/numa.c
drivers/misc/Makefile