diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:02:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:02:48 -0400 |
| commit | f12c03722045882a50c270f6332cf2c7b16a83d2 (patch) | |
| tree | 91744cede0a86272abd34fd5946a06e486abc2bc /arch/arm/mach-omap1/board-osk.c | |
| parent | eeb85d0b0e312ab9a6c3476f18308409913ab369 (diff) | |
| parent | 7495ab6837ea4660f5e14ad49e5bfc558d6862e7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/nes: Formatting cleanup
RDMA/nes: Add support for SFP+ PHY
RDMA/nes: Use LRO
IPoIB: Copy child MTU from parent
IB/mthca: Avoid changing userspace ABI to handle DMA write barrier attribute
IB/mthca: Avoid recycling old FMR R_Keys too soon
mlx4_core: Avoid recycling old FMR R_Keys too soon
IB/ehca: Allocate event queue size depending on max number of CQs and QPs
IPoIB: Use separate CQ for UD send completions
IB/iser: Count FMR alignment violations per session
IB/iser: Move high-volume debug output to higher debug level
IB/ehca: handle negative return value from ibmebus_request_irq() properly
RDMA/cxgb3: Support peer-2-peer connection setup
RDMA/cxgb3: Set the max_mr_size device attribute correctly
RDMA/cxgb3: Correctly serialize peer abort path
mlx4_core: Add a way to set the "collapsed" CQ flag
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
0 files changed, 0 insertions, 0 deletions