summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-05-202-14/+8
|\
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-1180-11/+101
| |\
| * \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-062-1/+2
| |\ \
| * | | net: convert multicast list to list_headJiri Pirko2010-04-032-9/+7
| * | | ipoib: remove addrlen check for mc addressesJiri Pirko2010-03-221-5/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-203-4/+4
|\ \ \ \
| * \ \ \ Merge branch 'master' into for-nextJiri Kosina2010-04-2383-21/+158
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix typos in commentsThomas Weber2010-03-163-4/+4
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
*-----------------. \ \ \ \ Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', '...Roland Dreier2010-05-1541-236/+9795
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | RDMA/nes: Make unnecessarily global functions staticRoland Dreier2010-04-212-3/+3
| | | | | | | | | | * | | | | RDMA/nes: Make nesadapter->phy_lock usage consistentChien Tung2010-04-213-20/+14
| | | | | | | | | | | |/ / / | | | | | | | | | | |/| | |
| | | | | | | | | * / | | | IB/mthca: Use the dma state API instead of pci equivalentsFUJITA Tomonori2010-04-213-8/+8
| | | | | | | | | |/ / / /
| | | | | | | | * / / / / IB/core: Use kmemdup() instead of kmalloc()+memcpy()Julia Lawall2010-05-152-5/+3
| | | | | | | | |/ / / /
| | | | | | | * / / / / IB/mlx4: Add support for masked atomic operationsVladimir Sokolovsky2010-04-213-11/+48
| | | | | | | |/ / / /
| | | | | | * | | | | IB/iser: Fix error flow in iser_create_ib_conn_res()Dan Carpenter2010-05-121-16/+9
| | | | | | * | | | | IB/iser: Enhance disconnection logic for multi-pathingOr Gerlitz2010-05-123-38/+46
| | | | | | * | | | | IB/iser: Remove buggy back-pointer settingOr Gerlitz2010-05-121-2/+0
| | | | | | * | | | | IB/iser: Add asynchronous event handlerOr Gerlitz2010-05-122-1/+16
| | | | | | |/ / / /
| | | | | * / / / / IPoIB: Allow disabling/enabling TSO on the fly through ethtoolOr Gerlitz2010-04-211-0/+20
| | | | | |/ / / /
| | | | * | | | | MAINTAINERS: Add cxgb4 and iw_cxgb4 entriesRoland Dreier2010-05-056-164/+224
| | | | * | | | | RDMA/cxgb4: Add driver for Chelsio T4 RNICSteve Wise2010-04-2116-0/+9447
| | | | |/ / / /
| | | * | | | | RDMA/cxgb3: Shrink .text with compile-time init of handlers arraysRoland Dreier2010-04-282-66/+65
| | | * | | | | RDMA/cxgb3: Don't free skbs on NET_XMIT_* indications from LLDSteve Wise2010-04-211-2/+2
| | | * | | | | RDMA/cxgb3: Use the dma state API instead of pci equivalentsFUJITA Tomonori2010-04-213-9/+9
| | | |/ / / /
| | * / / / / RDMA/cma: Randomize local port allocationTetsuo Handa2010-04-211-45/+25
| | |/ / / /
| * / / / / IB: Explicitly rule out llseek to avoid BKL in default_llseek()Roland Dreier2010-04-214-10/+20
| |/ / / /
* / / / / RDMA/amso1100: Use the dma state API instead of pci equivalentsFUJITA Tomonori2010-04-216-13/+13
|/ / / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-04-094-7/+7
|\ \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linusRoland Dreier2010-04-093-7/+6
| |\ \ \ \ \ \
| | | | * | | | RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()Chien Tung2010-04-071-5/+4
| | | | | |_|/ | | | | |/| |
| | | * / | | IB/mlx4: Check correct variable for allocation failureDan Carpenter2010-04-071-1/+1
| | | |/ / /
| | * / / / IB/cm: Fix device_create() return value checkJani Nikula2010-03-311-1/+1
| | |/ / /
| * / / / RDMA/cm: Set num_paths when manually assigning path recordsSean Hefty2010-04-071-0/+1
| |/ / /
* / / / include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3080-4/+94
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds2010-03-191-0/+1
|\ \ \
| * | | sysfs: fix sysfs lockdep warning in infiniband codeGreg Kroah-Hartman2010-03-191-0/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2010-03-181-1/+1
|\ \ \ | |/ / |/| |
| * | [SCSI] libiscsi: Make iscsi_eh_target_reset start with session resetJayamohan Kallickal2010-03-031-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-03-138-9/+55
|\ \ \ | |_|/ |/| |
| | |
| | \
| | \
| | \
| *---. \ Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-nextRoland Dreier2010-03-127-9/+53
| |\ \ \ \
| | | | * | RDMA/nes: Fix CX4 link problem in back-to-back configurationChien Tung2010-03-121-2/+28
| | | | * | RDMA/nes: Clear stall bit before destroying NIC QPChien Tung2010-03-112-0/+9
| | | | * | RDMA/nes: Set assume_aligned_header bitFaisal Latif2010-03-111-0/+1
| | | * | | IB/mad: Ignore iWARP devices on device removalSteve Wise2010-03-111-0/+3
| | | |/ /
| | * | | IPoIB: Include return code in trace message for ib_post_send() failuresOr Gerlitz2010-03-112-7/+10
| | * | | IPoIB: Fix TX queue lockup with mixed UD/CM trafficEli Cohen2010-03-111-0/+2
| | |/ /
| * / / RDMA/cxgb3: Wait at least one schedule cycle during device removalSteve Wise2010-03-111-0/+2
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-03-122-3/+3
|\ \ \
| * \ \ Merge branch 'for-next' into for-linusJiri Kosina2010-03-082-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | tree-wide: Assorted spelling fixesDaniel Mack2010-02-092-3/+3