summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2011-03-172-6/+6
|\
| * mm: export __get_user_pagesHuang Ying2011-03-172-6/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2011-03-171-0/+26
|\ \ | |/ |/|
| * [SCSI] iser: export addr and portMike Christie2011-02-241-0/+26
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-165-58/+28
|\ \
| * | ipv6: Convert to use flowi6 where applicable.David S. Miller2011-03-121-9/+9
| * | net: Put flowi_* prefix on AF independent members of struct flowiDavid S. Miller2011-03-121-1/+1
| * | ipv4: Create and use route lookup helpers.David S. Miller2011-03-124-45/+10
| * | ipv4: Make output route lookup return rtable directly.David S. Miller2011-03-024-6/+10
| * | ipv4: Kill can_sleep arg to ip_route_output_flow()David S. Miller2011-03-012-2/+2
| * | ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep"David S. Miller2011-03-012-2/+2
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-198-41/+62
| |\ \
| * | | net: make dev->master generalJiri Pirko2011-02-132-2/+3
| | |/ | |/|
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-nextRoland Dreier2011-03-159-20/+51
|\ \ \ \ \
| | | * | | IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADsMitko Haralanov2011-03-141-2/+3
| | | * | | IB/qib: Set default LE2 value for active cables to 0Mitko Haralanov2011-03-142-3/+12
| | | * | | IB/qib: Return correct MAD when setting link width to 255Mitko Haralanov2011-02-221-3/+4
| | | | |/ | | | |/|
| | * / | IB/ipath: Don't reset disabled devicesNicolas Kaiser2011-03-141-0/+1
| | |/ /
| * | | RDMA/cxgb4: Debugfs dump_qp() updatesSteve Wise2011-03-141-4/+9
| * | | RDMA/cxgb4: Dispatch FATAL event on EEH errorsSteve Wise2011-03-141-1/+9
| * | | RDMA/cxgb4: Use ULP_MODE_TCPDDPSteve Wise2011-03-141-0/+2
| * | | RDMA/cxgb4: Enable on-chip SQ support by defaultSteve Wise2011-03-141-2/+2
| * | | RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reapsSteve Wise2011-03-141-1/+7
| * | | RDMA/cxgb4: Remove db_drop_taskSteve Wise2011-03-142-2/+0
| * | | RDMA/cxgb4: Turn on delayed ACKSteve Wise2011-03-141-2/+2
| |/ /
* | | RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific oneSean Hefty2011-03-151-27/+16
* | | IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH stateSean Hefty2011-03-151-1/+18
* | | IB/cm: Bump reference count on cm_id before invoking callbackSean Hefty2011-03-151-0/+1
* | | RDMA/cma: Fix crash in request handlersSean Hefty2011-03-151-0/+15
|/ /
* | Merge branches 'nes' and 'qib' into for-nextRoland Dreier2011-02-171-1/+4
|\ \
| * | IB/qib: Prevent double completions after a timeout or RNR errorMike Marciniszyn2011-02-171-1/+2
| * | IB/qib: Fix double add_timer()Mike Marciniszyn2011-02-101-0/+2
* | | RDMA/nes: Don't generate async events for unregistered devicesMaciej Sosnowski2011-02-031-12/+20
|/ /
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-02-036-28/+38
|\ \ | |/ |/|
| *-------. Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-...Roland Dreier2011-01-295-25/+35
| |\ \ \ \ \
| | | | | | * IB/qib: Hold link for TX SERDES settingsMitko Haralanov2011-01-281-19/+11
| | | | | |/
| | | | * / RDMA: Update missed conversion of flush_scheduled_work()Tejun Heo2011-01-281-1/+1
| | | | |/
| | | * | RDMA/cxgb4: Set the correct device physical function for iWARP connectionsSteve Wise2011-01-281-1/+1
| | | * | RDMA/cxgb4: Limit MAXBURST EQ context field to 256BSteve Wise2011-01-281-2/+2
| | | |/
| | * / RDMA/ucma: Copy iWARP route information on queriesSteve Wise2011-01-281-2/+20
| | |/
| * / RDMA/amso1100: Fix compile warningsRalf Thielow2011-01-281-3/+3
| |/
* / kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-202-2/+2
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-01-1731-122/+320
|\
| *-----. Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-nextRoland Dreier2011-01-1614-38/+269
| |\ \ \ \
| | | | | * IB/srp: Test only once whether iu allocation succeededBart Van Assche2011-01-131-8/+7
| | | | * | RDMA/nes: Fix incorrect SFP+ link status detection on driver initMaciej Sosnowski2011-01-161-4/+39
| | | | * | RDMA/nes: Fix SFP+ link down detection issue with switch port disableMaciej Sosnowski2011-01-164-0/+100
| | | | * | RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE eventsMaciej Sosnowski2011-01-164-9/+83
| | | | * | RDMA/nes: Fix bonding on iw_nesMaciej Sosnowski2011-01-162-6/+26
| | | | |/
| | | * / IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)John L. Burr2011-01-115-6/+7
| | | |/