From: Linus Torvalds Date: Wed, 31 Dec 2008 01:45:28 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... X-Git-Tag: v2.6.29-rc1~554 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b;p=linux-2.6-omap-h63xx.git 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: Fix reading SL field out of cqe->sl_vid RDMA/addr: Fix build breakage when IPv6 is disabled --- 6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b