From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 22:05:28 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.33-rc4~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c8ad49b015eb115fbd6982f56d530f53cf57f84;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://git./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
---

3c8ad49b015eb115fbd6982f56d530f53cf57f84