From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2008 14:46:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.25-rc9~98
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c61f72c72e0e1181f91831f106c5f7306238706;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: remove unused calc_npages() in iommu_common.h
  sparc64: add the segment boundary checking to IOMMUs while merging SG entries
  [SPARC64]: Don't open-code {get,put}_cpu_var() in flush_tlb_pending().
---

4c61f72c72e0e1181f91831f106c5f7306238706