aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw
Commit message (Expand)AuthorAge
* Merge branches 'cxgb4' and 'qib' into for-nextRoland Dreier2011-06-17
|\
| * IB/qib: Ensure that LOS and DFE are being turned offMitko Haralanov2011-06-17
* | RDMA/cxgb4: Couple of abort fixesSteve Wise2011-06-17
* | RDMA/cxgb4: Don't truncate MR lengthsSteve Wise2011-06-17
* | RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQsSteve Wise2011-06-17
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-26
|\
| *-----. Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '...Roland Dreier2011-05-25
| |\ \ \ \
| | | | | * RDMA: Add netlink infrastructureRoland Dreier2011-05-20
| | |_|_|/ | |/| | |
| | | | * RDMA/nes: Add a check for strict_strtoul()Liu Yuan2011-05-24
| | |_|/ | |/| |
| | | * RDMA/cxgb4: Use completion objects for event blockingSteve Wise2011-05-24
| | |/ | |/|
| | * RDMA/cxgb3: Don't post zero-byte read if endpoint is going awaySteve Wise2011-05-24
| |/
* | Add appropriate <linux/prefetch.h> include for prefetch usersPaul Gortmaker2011-05-23
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-20
|\ \
| * | ipv4: Make caller provide on-stack flow key to ip_route_output_ports().David S. Miller2011-05-03
| * | ethtool: cosmetic: Use ethtool ethtool_cmd_speed APIDavid Decotigny2011-04-29
| * | net: infiniband/hw/nes: convert to hw_featuresMichał Mirosław2011-04-20
* | | Merge remote branch 'origin/master' into mergeBenjamin Herrenschmidt2011-05-20
|\ \ \ | | |/ | |/|
| | |
| | \
| *-. \ Merge branches 'cma', 'cxgb4' and 'qib' into for-nextRoland Dreier2011-05-12
| |\ \ \
| | | * | IB/qib: Use pci_dev->revisionSergei Shtylyov2011-05-12
| | | * | IB/ipath: Use pci_dev->revision, againSergei Shtylyov2011-05-10
| | | * | IB/qib: Prevent driver hang with unprogrammed boardsMitko Haralanov2011-05-10
| | * | | RDMA/cxgb4: EEH errors can hang the driverSteve Wise2011-05-10
| | * | | RDMA/cxgb4: Reset wait condition atomicallySteve Wise2011-05-10
| | * | | RDMA/cxgb4: Fix missing parenthesesRoel Kluin2011-05-10
| | * | | RDMA/cxgb4: Initialization errors can cause crashSteve Wise2011-05-10
| | * | | RDMA/cxgb4: Don't change QP state outside EP lockSteve Wise2011-05-10
| | |/ /
| * / / RDMA/iwcm: Get rid of enum iw_cm_event_statusRoland Dreier2011-05-10
| |/ /
* | | Merge branch 'merge' into nextBenjamin Herrenschmidt2011-05-19
|\| |
| * | Revert wrong fixes for common misspellingsLucas De Marchi2011-04-27
| |/
* / cxgb4: use pgprot_writecombine() on powerpcNishanth Aravamudan2011-04-27
|/
* Fix common misspellingsLucas De Marchi2011-03-31
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-26
|\
| * RDMA/nes: Fix test of uninitialized netdevRoland Dreier2011-03-24
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-03-26
|\ \ | |/ |/|
| * mlx4: generalization of multicast steering.Yevgeny Petrilin2011-03-23
| * mlx4_en: Reporting HW revision in ethtool -iYevgeny Petrilin2011-03-23
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-24
|\ \ | |/ |/|
| *-. Merge branches 'misc', 'nes' and 'srp' into for-nextRoland Dreier2011-03-23
| |\ \
| | * | RDMA/nes: Don't print success message at level KERN_ERRRoland Dreier2011-03-18
| | |/
| * / IB: Increase DMA max_segment_size on Mellanox hardwareDavid Dillow2011-03-22
| |/
* / mm: export __get_user_pagesHuang Ying2011-03-17
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-16
|\
| * ipv4: Create and use route lookup helpers.David S. Miller2011-03-12
| * ipv4: Make output route lookup return rtable directly.David S. Miller2011-03-02
| * ipv4: Kill can_sleep arg to ip_route_output_flow()David S. Miller2011-03-01
| * ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep"David S. Miller2011-03-01
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-19
| |\
| * | net: make dev->master generalJiri Pirko2011-02-13
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-nextRoland Dreier2011-03-15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | | * | IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADsMitko Haralanov2011-03-14