Merge branches 'iser' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Wed, 5 Jun 2013 00:06:46 +0000 (17:06 -0700)
committerRoland Dreier <roland@purestorage.com>
Wed, 5 Jun 2013 00:06:46 +0000 (17:06 -0700)
commitc9a2433a901250637e05539ef111b91dbc52edb8
tree48bbe8586a3ce62a9f30acbf2a46e5f36b39f16a
parent1e65eb425b660ccd7c8d3ffb353512352690c67f
parentf3bdf34465307fc3f6967a9202a921e11505b2e6
Merge branches 'iser' and 'qib' into for-next