]> git.baikalelectronics.ru Git - kernel.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)
commit5084d8b1553132f8ecec542169bb352d65c08ab1
tree837da034751a2fc1be0fc5a105c218d41a498eb6
parent99e85bcc505cdad3d36d4c142570bb1541257e9f
parent38ef932eb439cc0d9ae68d3747acf64fc037c9c4
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().
arch/sparc64/mm/hugetlbpage.c
arch/sparc64/mm/init.c