summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2010-06-1679-5143/+50659
|\
| * fix the deadlock in qib_fsAl Viro2010-06-041-3/+1
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-05-305-622/+203
| |\
| | * Merge branches 'misc' and 'qib' into for-nextRoland Dreier2010-05-274-614/+200
| | |\
| | | * IB/qib: Remove DCA support until feature is finishedRalph Campbell2010-05-271-189/+0
| | | * IB/qib: Use a single txselect module parameter for serdes tuningRalph Campbell2010-05-261-403/+179
| | | * IB/qib: Don't rely on (undefined) order of function parameter evaluationRoland Dreier2010-05-261-10/+15
| | | * IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=nRalph Campbell2010-05-252-12/+6
| | * | IB/ucm: Use memdup_user()Julia Lawall2010-05-251-8/+3
| | |/
| * | ehca: convert cpu notifier to return encapsulate errno valueAkinobu Mita2010-05-271-1/+1
| |/
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-05-2577-5126/+51061
| |\
| | *-----. Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-nextRoland Dreier2010-05-2571-5051/+50957
| | |\ \ \ \
| | | | | | * IB/ipath: Remove support for QLogic PCIe QLE devicesRalph Campbell2010-05-239-7131/+7
| | | | | | * IB/qib: Add new qib driver for QLogic PCIe InfiniBand adaptersRalph Campbell2010-05-2351-0/+52965
| | | | | | * IB/core: Allow device-specific per-port sysfs filesRalph Campbell2010-05-2111-15/+32
| | | | | |/ | | | | |/|
| | | | | * RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()Chien Tung2010-05-251-1/+2
| | | | | * RDMA/nes: Async event for closed QP causes crashFaisal Latif2010-05-241-0/+9
| | | | | * RDMA/nes: Have ethtool read hardware registers for rx/tx statsFaisal Latif2010-05-241-17/+55
| | | | |/
| | | * | IB/mad: Make needlessly global mad_sendq_size/mad_recvq_size staticRoland Dreier2010-05-231-2/+2
| | | |/
| | * | RDMA/cxgb4: Only insert sq qid in lookup tableSteve Wise2010-05-241-16/+9
| | * | RDMA/cxgb4: Support IB_WR_READ_WITH_INV opcodeSteve Wise2010-05-241-1/+5
| | * | RDMA/cxgb4: Set fence flag for inv-local-stag work requestsSteve Wise2010-05-241-0/+2
| | * | RDMA/cxgb4: Update some HW limitsSteve Wise2010-05-241-8/+9
| | * | RDMA/cxgb4: Don't limit fastreg page list depthSteve Wise2010-05-241-3/+0
| | * | RDMA/cxgb4: Return proper errors in fastreg mr/pbl allocationSteve Wise2010-05-241-2/+6
| | * | RDMA/cxgb4: Fix overflow bug in CQ armSteve Wise2010-05-241-19/+12
| | * | RDMA/cxgb4: Optimize CQ overflow detectionSteve Wise2010-05-242-12/+17
| | * | RDMA/cxgb4: CQ size must be IQ size - 2Steve Wise2010-05-241-1/+4
| | * | RDMA/cxgb4: Register RDMA provider based on LLD state_change eventsSteve Wise2010-05-243-10/+39
| | * | RDMA/cxgb4: Detach from the LLD after unregistering RDMA deviceSteve Wise2010-05-241-3/+1
| | |/
| * | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2251-267/+9820
| |\ \
| * | | of: Remove duplicate fields from of_platform_driverGrant Likely2010-05-221-3/+4
| * | | of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-181-5/+6
* | | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-161-1/+1
* | | | fix typos concerning "hierarchy"Uwe Kleine-König2010-06-162-4/+4
| |/ / |/| |
* | | 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
OpenPOWER on IntegriCloud