diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 11:53:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 11:53:06 -0700 |
| commit | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (patch) | |
| tree | 83855363f7be25305477dca09a91166deb376354 /drivers/net/hp.c | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus (diff) | |
| download | linux-dev-0eddb519b9127c73d53db4bf3ec1d45b13f844d1.tar.xz linux-dev-0eddb519b9127c73d53db4bf3ec1d45b13f844d1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mlx4: Check correct variable for allocation failure
RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
RDMA/cm: Set num_paths when manually assigning path records
IB/cm: Fix device_create() return value check
Diffstat (limited to 'drivers/net/hp.c')
0 files changed, 0 insertions, 0 deletions