| commit | 3c8ad49b015eb115fbd6982f56d530f53cf57f84 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 08 14:05:28 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 08 14:05:28 2010 -0800 |
| tree | 6a254fd78622a61443a61cc893d0a84a9413bbd5 | |
| parent | 9993b364d2c42acc2949ddbc6371405e17829e32 [diff] | |
| parent | 0139fd7c2ffd830e571d56f60198306ac24b726e [diff] |
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/addr: Correct CONFIG_IPv6 to CONFIG_IPV6 mlx4_core: Fix cleanup in __mlx4_init_one() error path IB/mlx4: Fix queue overflow check in post_recv IB/mlx4: Initialize SRQ scatter entries when creating an SRQ