From: Roland Dreier <roland@purestorage.com>
Date: Mon, 23 Jul 2012 06:26:17 +0000 (-0700)
Subject: Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and... 
X-Git-Tag: v3.6-rc1~115^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=089117e1ad265625b523a4168f77f2521b18fd32;p=pandora-kernel.git

Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
---

089117e1ad265625b523a4168f77f2521b18fd32
Reading git-diff-tree failed