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: MMI-PSA29.97-13-9~51148^2~20 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d04ef3a795b3b7b376a02713ed5e211e9ae1f917;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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(). --- d04ef3a795b3b7b376a02713ed5e211e9ae1f917