diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 10:10:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 10:10:14 -0700 |
commit | 2d630d1a6827bb7266dcd8bba5f99fac2505ee97 (patch) | |
tree | e954840c63cff13f58d4218681435e749afda345 /drivers/input/joystick | |
parent | f375d5588ff62caf31b4a68ac9347c153ac56590 (diff) | |
parent | ed4d3c1061d6f367a4ef5e1656c25af3314fe2b7 (diff) | |
download | linux-2d630d1a6827bb7266dcd8bba5f99fac2505ee97.tar.bz2 |
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:
mlx4_core: Add helper to move QP to ready-to-send
mlx4_core: Add HW queues allocation helpers
RDMA/nes: Remove volatile qualifier from struct nes_hw_cq.cq_vbase
mlx4_core: CQ resizing should pass a 0 opcode modifier to MODIFY_CQ
mlx4_core: Move kernel doorbell management into core
IB/ehca: Bump version number to 0026
IB/ehca: Make some module parameters bool, update descriptions
IB/ehca: Remove mr_largepage parameter
IB/ehca: Move high-volume debug output to higher debug levels
IB/ehca: Prevent posting of SQ WQEs if QP not in RTS
IPoIB: Handle 4K IB MTU for UD (datagram) mode
RDMA/nes: Fix adapter reset after PXE boot
RDMA/nes: Print IPv4 addresses in a readable format
RDMA/nes: Use print_mac() to format ethernet addresses for printing
Diffstat (limited to 'drivers/input/joystick')
0 files changed, 0 insertions, 0 deletions