tree 837da034751a2fc1be0fc5a105c218d41a498eb6
parent 36177ba655c238e33400cc2837a28720b62784bd
parent dcc1e8dd88d4bc55e32a26dad7633d20ffe606d2
author Linus Torvalds <torvalds@g5.osdl.org> 1143053817 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143053817 -0800

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().