Merge branches 'misc' and 'qib' into for-next
authorRoland Dreier <rolandd@cisco.com>
Thu, 27 May 2010 18:05:04 +0000 (11:05 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 27 May 2010 18:05:04 +0000 (11:05 -0700)

Trivial merge