diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-25 15:49:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-25 15:49:56 -0700 |
commit | 1ea0975875294964853209927feccdf6bc8cf5f9 (patch) | |
tree | b5d2feab6211ee987fb30bca35493fd6569003bb /mm/mmap.c | |
parent | a41d7f000447015f3f5fe7223f1d53845268e2e8 (diff) | |
parent | 2dfbfc37121d307e1f1d24c2979382cb17b19347 (diff) |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB/cm: Drain cq in ipoib_cm_dev_stop()
IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop()
IB/ehca: Fix number of send WRs reported for new QP
IB/mlx4: Initialize send queue entry ownership bits
IB/mlx4: Don't allocate RQ doorbell if using SRQ
Diffstat (limited to 'mm/mmap.c')
0 files changed, 0 insertions, 0 deletions