Merge branches 'iser' and 'qib' into for-next
Roland Dreier [Wed, 5 Jun 2013 00:06:46 +0000 (17:06 -0700)]

Trivial merge