]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36177ba dcc1e8d)
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)
* 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().

1  2 
arch/sparc64/mm/hugetlbpage.c patch | diff1 | diff2 | blob | history
arch/sparc64/mm/init.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc64/mm/hugetlbpage.c
Simple merge
diff --cc arch/sparc64/mm/init.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.