From: Roland Dreier <roland@purestorage.com>
Date: Mon, 30 Jul 2012 14:47:27 +0000 (-0700)
Subject: Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1da9b6b43e31a5d88a82cc70b8f57090c9dd2be8;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
---

1da9b6b43e31a5d88a82cc70b8f57090c9dd2be8