]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Mar 2006 18:56:57 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Mar 2006 18:56:57 +0000 (10:56 -0800)
commitd04ef3a795b3b7b376a02713ed5e211e9ae1f917
tree837da034751a2fc1be0fc5a105c218d41a498eb6
parent36177ba655c238e33400cc2837a28720b62784bd
parentdcc1e8dd88d4bc55e32a26dad7633d20ffe606d2
Merge /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().
arch/sparc64/mm/hugetlbpage.c
arch/sparc64/mm/init.c