Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 'srp' into for-next

Browse source

...

This commit is contained in:

Roland Dreier 2011-07-22 11:56:11 -07:00

parent 2efdd6a038 3cbe182a5b 5763181172 10e1b54bbb e1892fa80d 9b89925c0d e67306a380 fd1b6c4a69

commit 4460207561

52 changed files with 962 additions and 1122 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

MAINTAINERS

View file

3

drivers/infiniband/core/cache.c

View file

6

drivers/infiniband/core/device.c

View file

9

drivers/infiniband/hw/amso1100/c2_provider.c

View file

8

drivers/infiniband/hw/cxgb3/iwch_provider.c

View file

8

drivers/infiniband/hw/cxgb4/provider.c

View file

9

drivers/infiniband/hw/cxgb4/resource.c

View file

11

drivers/infiniband/hw/ipath/ipath_file_ops.c

View file

198

drivers/infiniband/hw/ipath/ipath_mad.c

View file

68

drivers/infiniband/hw/mlx4/mad.c

View file

21

drivers/infiniband/hw/mlx4/main.c

View file

1

drivers/infiniband/hw/mlx4/mlx4_ib.h

View file

10

drivers/infiniband/hw/mlx4/qp.c

View file

276

drivers/infiniband/hw/mthca/mthca_cmd.c

View file

93

drivers/infiniband/hw/mthca/mthca_cmd.h

View file

15

drivers/infiniband/hw/mthca/mthca_cq.c

View file

43

drivers/infiniband/hw/mthca/mthca_eq.c

View file

15

drivers/infiniband/hw/mthca/mthca_mad.c

View file

175

drivers/infiniband/hw/mthca/mthca_main.c

View file

101

drivers/infiniband/hw/mthca/mthca_mcg.c

View file

43

drivers/infiniband/hw/mthca/mthca_memfree.c

View file

35

drivers/infiniband/hw/mthca/mthca_mr.c

View file

77

drivers/infiniband/hw/mthca/mthca_provider.c

View file

49

drivers/infiniband/hw/mthca/mthca_qp.c

View file

2

drivers/infiniband/hw/mthca/mthca_reset.c

View file

33

drivers/infiniband/hw/mthca/mthca_srq.c

View file

11

drivers/infiniband/hw/nes/nes_verbs.c

View file

3

drivers/infiniband/hw/qib/qib.h

View file

16

drivers/infiniband/hw/qib/qib_file_ops.c

View file

26

drivers/infiniband/hw/qib/qib_iba7220.c

View file

72

drivers/infiniband/hw/qib/qib_iba7322.c

View file

78

drivers/infiniband/hw/qib/qib_mad.c

View file

143

drivers/infiniband/hw/qib/qib_mad.h

View file

8

drivers/infiniband/hw/qib/qib_pcie.c

View file

14

drivers/infiniband/hw/qib/qib_sysfs.c

View file

2

drivers/infiniband/ulp/srp/ib_srp.c

View file

9

drivers/net/mlx4/en_ethtool.c

View file

3

drivers/net/mlx4/en_main.c

View file

5

drivers/net/mlx4/en_netdev.c

View file

6

drivers/net/mlx4/en_port.c

View file

3

drivers/net/mlx4/en_selftest.c

View file

39

drivers/net/mlx4/fw.c

View file

8

drivers/net/mlx4/fw.h

View file

58

drivers/net/mlx4/main.c

View file

17

drivers/net/mlx4/mcg.c

View file

5

drivers/net/mlx4/mlx4.h

View file

8

drivers/net/mlx4/port.c

View file

3

include/linux/mlx4/cmd.h

View file

60

include/linux/mlx4/device.h

View file

8

include/linux/mlx4/qp.h

View file

156

include/rdma/ib_pma.h

View file

3

include/rdma/ib_verbs.h

View file