tree 448350a5bf4a8b53417cfa97ad234be05c2a4590
parent 2f819ae8816990aaad46dd6d1748a096d136df68
parent c819914e0d5cc85cccf5fe7542fcb9586286bc28
author Linus Torvalds <torvalds@linux-foundation.org> 1207147601 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207147601 -0700

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().