tree 48bbe8586a3ce62a9f30acbf2a46e5f36b39f16a
parent 1e65eb425b660ccd7c8d3ffb353512352690c67f
parent f3bdf34465307fc3f6967a9202a921e11505b2e6
author Roland Dreier <roland@purestorage.com> 1370390806 -0700
committer Roland Dreier <roland@purestorage.com> 1370390806 -0700

Merge branches 'iser' and 'qib' into for-next