tree eb3fba9d0fddc47e29699e689bb45e79a22d1116
parent dba94f2155f581395ef9608418778e3491b3d470
parent ccb301862aa51ea7c10c10b440f3e8bbeac5b720
author Linus Torvalds <torvalds@linux-foundation.org> 1429394489 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1429394489 -0400

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

Pull sparc fixes from David Miller
 "Unfortunately, I brown paper bagged the generic iommu pool allocator
  by applying the wrong revision of the patch series.

  This reverts the bad one, and puts the right one in"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.