Merge branch 'linus' into core/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 17 Oct 2008 09:20:52 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 17 Oct 2008 09:20:52 +0000 (11:20 +0200)
1  2 
arch/powerpc/include/asm/page.h

Simple merge