Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Jun 2006 23:02:22 +0000 (16:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Jun 2006 23:02:22 +0000 (16:02 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix D-cache corruption in mremap
  [SPARC64]: Make smp_processor_id() functional before start_kernel()

1  2 
include/asm-mips/pgtable.h

Simple merge