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)

Trivial merge