From: Roland Dreier <roland@purestorage.com>
Date: Tue, 23 Oct 2012 16:03:49 +0000 (-0700)
Subject: Merge branches 'cxgb4' and 'mlx4' into for-next
X-Git-Tag: v3.7-rc3~10^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e3474d1de922ea3df176a0efbef843ada2dd43b;p=platform%2Fkernel%2Flinux-3.10.git

Merge branches 'cxgb4' and 'mlx4' into for-next
---

1e3474d1de922ea3df176a0efbef843ada2dd43b