From: Linus Torvalds Date: Wed, 22 Mar 2006 18:56:57 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.17-rc1~1129^2~2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d04ef3a795b3b7b376a02713ed5e211e9ae1f917;p=linux-2.6 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(). --- d04ef3a795b3b7b376a02713ed5e211e9ae1f917