Merge branch 'fixes' into for-next
authorJames Bottomley <James.Bottomley@suse.de>
Thu, 21 Apr 2011 14:36:14 +0000 (09:36 -0500)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 21 Apr 2011 14:36:14 +0000 (09:36 -0500)

Trivial merge