Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 25 Jun 2006 23:07:58 +0000 (16:07 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 25 Jun 2006 23:07:58 +0000 (16:07 -0700)
commit61b9175808670d9abf52156803ae0ed1e3706ac4
treefeeaf7190aff1daa6ae365fd7c1107ea2d60fb9f
parentf36f44de721db44b4c2944133c3c5c2e06f633f0
parent3f1244a2f8d3892f991b662cea49b2a0b4e0c115
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/iser: iSER Kconfig and Makefile
  IB/iser: iSER handling of memory for RDMA
  IB/iser: iSER RDMA CM (CMA) and IB verbs interaction
  IB/iser: iSER initiator iSCSI PDU and TX/RX
  IB/iser: iSCSI iSER transport provider high level code
  IB/iser: iSCSI iSER transport provider header file
  IB/uverbs: Remove unnecessary list_del()s
  IB/uverbs: Don't free wr list when it's known to be empty
drivers/infiniband/core/uverbs_main.c
drivers/scsi/Makefile