From: Linus Torvalds <torvalds@g5.osdl.org>
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: upstream/snapshot3+hdmi~41843^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d04ef3a795b3b7b376a02713ed5e211e9ae1f917;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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