Revision 3c8ad49b015eb115fbd6982f56d530f53cf57f84 authored by Linus Torvalds on 08 January 2010, 22:05:28 UTC, committed by Linus Torvalds on 08 January 2010, 22:05:28 UTC
* '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