tree c1aa500b31433206cf023d1114a678e1dce1efcf
parent 87773dd56d5405ac28119fcfadacefd35877c18f
parent 68f9d83c7765b110de54677573e9538f3ca6ca04
parent 61aabb3c91c1b03478ffc1a4a2573f825e7f35f9
parent 25476b0209b2e48dfb689e1b4cf7278875082b1f
parent f0c2c225dfe9dfb668fe72eadabb8a3ec74ca036
parent 85cbb7c728bf39c45a9789b88c9471c0d7a58b0e
author Roland Dreier <roland@purestorage.com> 1411405540 -0700
committer Roland Dreier <roland@purestorage.com> 1411405540 -0700

Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next