diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 16:19:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 16:19:26 -0400 |
| commit | e2fdae7e7c5a690b10b2d2891ec819e554dc033d (patch) | |
| tree | 7b48f55eba9519aeee554a58be9d1ff8a8adffd6 /net/ipv4/inet_diag.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
| parent | iommu-common: Fix PARISC compile-time warnings (diff) | |
| download | linux-dev-e2fdae7e7c5a690b10b2d2891ec819e554dc033d.tar.xz linux-dev-e2fdae7e7c5a690b10b2d2891ec819e554dc033d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"The PowerPC folks have a really nice scalable IOMMU pool allocator
that we wanted to make use of for sparc. So here we have a series
that abstracts out their code into a common layer that anyone can make
use of.
Sparc is converted, and the PowerPC folks have reviewed and ACK'd this
series and plan to convert PowerPC over as well"
* 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
sparc: Break up monolithic iommu table/lock into finer graularity pools and lock
Diffstat (limited to 'net/ipv4/inet_diag.c')
0 files changed, 0 insertions, 0 deletions