]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'origin' into master
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:52:04 +0000 (15:52 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:52:04 +0000 (15:52 +1100)
commit6ddc9d587d06fe7a550dfc96842d1fad845b7bed
treebf1f6467978ec63a22f42299ecac2ee7f7e73336
parent5f211a9f35e13c98f19678cf8f2cb7f32883c399
parentfe00b7ac5d354d23437846c1b3ee6193c64191cb
Merge commit 'origin' into master

Manual merge of:

arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
arch/powerpc/platforms/cell/spufs/sputrace.c