Merge branches 'nes' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 17 Feb 2011 22:04:59 +0000 (14:04 -0800)
committerRoland Dreier <roland@purestorage.com>
Thu, 17 Feb 2011 22:04:59 +0000 (14:04 -0800)

Trivial merge