summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branches 'cxgb4' and 'qib' into for-nextRoland Dreier2011-06-172-8/+23
|\
| * IB/qib: Ensure that LOS and DFE are being turned offMitko Haralanov2011-06-172-8/+23
* | RDMA/cxgb4: Couple of abort fixesSteve Wise2011-06-172-13/+38
* | RDMA/cxgb4: Don't truncate MR lengthsSteve Wise2011-06-171-1/+1
* | RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQsSteve Wise2011-06-171-0/+4
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-266-28/+30
|\
| *-----. Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '...Roland Dreier2011-05-256-28/+30
| |\ \ \ \
| | | | | * RDMA: Add netlink infrastructureRoland Dreier2011-05-201-1/+1
| | |_|_|/ | |/| | |
| | | | * RDMA/nes: Add a check for strict_strtoul()Liu Yuan2011-05-241-1/+3
| | |_|/ | |/| |
| | | * RDMA/cxgb4: Use completion objects for event blockingSteve Wise2011-05-241-13/+5
| | |/ | |/|
| | * RDMA/cxgb3: Don't post zero-byte read if endpoint is going awaySteve Wise2011-05-243-13/+21
| |/
* | Add appropriate <linux/prefetch.h> include for prefetch usersPaul Gortmaker2011-05-231-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-205-58/+13
|\ \
| * | ipv4: Make caller provide on-stack flow key to ip_route_output_ports().David S. Miller2011-05-042-2/+4
| * | ethtool: cosmetic: Use ethtool ethtool_cmd_speed APIDavid Decotigny2011-04-291-2/+2
| * | net: infiniband/hw/nes: convert to hw_featuresMichał Mirosław2011-04-203-54/+7
* | | Merge remote branch 'origin/master' into mergeBenjamin Herrenschmidt2011-05-2010-120/+117
|\ \ \ | | |/ | |/|
| | |
| | \
| *-. \ Merge branches 'cma', 'cxgb4' and 'qib' into for-nextRoland Dreier2011-05-128-111/+108
| |\ \ \
| | | * | IB/qib: Use pci_dev->revisionSergei Shtylyov2011-05-121-4/+1
| | | * | IB/ipath: Use pci_dev->revision, againSergei Shtylyov2011-05-101-8/+1
| | | * | IB/qib: Prevent driver hang with unprogrammed boardsMitko Haralanov2011-05-101-1/+2
| | * | | RDMA/cxgb4: EEH errors can hang the driverSteve Wise2011-05-103-53/+66
| | * | | RDMA/cxgb4: Reset wait condition atomicallySteve Wise2011-05-102-30/+26
| | * | | RDMA/cxgb4: Fix missing parenthesesRoel Kluin2011-05-101-1/+1
| | * | | RDMA/cxgb4: Initialization errors can cause crashSteve Wise2011-05-101-3/+3
| | * | | RDMA/cxgb4: Don't change QP state outside EP lockSteve Wise2011-05-103-12/+9
| | |/ /
| * / / RDMA/iwcm: Get rid of enum iw_cm_event_statusRoland Dreier2011-05-102-9/+9
| |/ /
* | | Merge branch 'merge' into nextBenjamin Herrenschmidt2011-05-193-3/+3
|\| |
| * | Revert wrong fixes for common misspellingsLucas De Marchi2011-04-273-3/+3
| |/
* / cxgb4: use pgprot_writecombine() on powerpcNishanth Aravamudan2011-04-271-4/+1
|/
* Fix common misspellingsLucas De Marchi2011-03-3121-32/+32
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-261-1/+1
|\
| * RDMA/nes: Fix test of uninitialized netdevRoland Dreier2011-03-251-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-03-261-6/+5
|\ \ | |/ |/|
| * mlx4: generalization of multicast steering.Yevgeny Petrilin2011-03-231-5/+5
| * mlx4_en: Reporting HW revision in ethtool -iYevgeny Petrilin2011-03-231-1/+0
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-242-1/+4
|\ \ | |/ |/|
| *-. Merge branches 'misc', 'nes' and 'srp' into for-nextRoland Dreier2011-03-231-1/+1
| |\ \
| | * | RDMA/nes: Don't print success message at level KERN_ERRRoland Dreier2011-03-181-1/+1
| | |/
| * / IB: Increase DMA max_segment_size on Mellanox hardwareDavid Dillow2011-03-221-0/+3
| |/
* / mm: export __get_user_pagesHuang Ying2011-03-172-6/+6
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-174-40/+15
|\
| * ipv4: Create and use route lookup helpers.David S. Miller2011-03-133-38/+9
| * ipv4: Make output route lookup return rtable directly.David S. Miller2011-03-023-3/+6
| * 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-206-38/+41
| |\
| * | 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