diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 18:01:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 18:01:29 -0400 |
| commit | 64fb1d0e975e92e012802d371e417266d6531676 (patch) | |
| tree | eb3fba9d0fddc47e29699e689bb45e79a22d1116 /kernel | |
| parent | Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (diff) | |
| parent | Merge branch 'iommu-generic-allocator' (diff) | |
| download | linux-dev-64fb1d0e975e92e012802d371e417266d6531676.tar.xz linux-dev-64fb1d0e975e92e012802d371e417266d6531676.zip | |
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.
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions