diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 03:59:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 03:59:55 +0200 |
| commit | 941c8726e4e737e74d418ccec3d8e7b946a65541 (patch) | |
| tree | 0c3585d8bc16fb6fa7c0efd9db9d32da1ea7bd6e /arch/arm/mach-pxa/magician.c | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next (diff) | |
| download | linux-941c8726e4e737e74d418ccec3d8e7b946a65541.tar.xz linux-941c8726e4e737e74d418ccec3d8e7b946a65541.zip | |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull final RDMA changes from Roland Dreier:
- Fix IPoIB to stop using unsafe linkage between networking neighbour
layer and private path database.
- Small fixes for bugs found by Fengguang Wu's automated builds.
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB: Use a private hash table for path lookup in xmit path
IB/qib: Fix size of cc_supported_table_entries
RDMA/ucma: Convert open-coded equivalent to memdup_user()
RDMA/ocrdma: Fix check of GSI CQs
RDMA/cma: Use PTR_RET rather than if (IS_ERR(...)) + PTR_ERR
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
0 files changed, 0 insertions, 0 deletions