From: Roland Dreier Date: Mon, 22 Sep 2014 17:05:40 +0000 (-0700) Subject: Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next X-Git-Tag: v3.17-rc7~22^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3bdad2d13fa62bcb59ca2506e74ce467ea436586;p=users%2Fjedix%2Flinux-maple.git Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next --- 3bdad2d13fa62bcb59ca2506e74ce467ea436586