Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Add a secondary TSB for hugepage mappings.
  [SPARC]: Respect vm_page_prot in io_remap_page_range().
This commit is contained in:
Linus Torvalds 2006-03-22 10:56:57 -08:00
commit d04ef3a795
24 changed files with 491 additions and 222 deletions