]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge remote branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 14 Oct 2010 23:45:03 +0000 (10:45 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 14 Oct 2010 23:45:03 +0000 (10:45 +1100)
1  2 
arch/powerpc/kernel/cputable.c

Simple merge