From: Roland Dreier Date: Tue, 3 Feb 2015 17:29:25 +0000 (-0800) Subject: Merge branches 'ipoib' and 'odp' into for-next X-Git-Tag: fixes-v4.0-rc1~208^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecb7b1233c532c60fa7a8927a43944e69f6e6b1a;p=pandora-kernel.git Merge branches 'ipoib' and 'odp' into for-next --- ecb7b1233c532c60fa7a8927a43944e69f6e6b1a