From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Mar 2010 00:04:03 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console
X-Git-Tag: v2.6.34-rc1~6
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=25cf84cf377c0aae5dbcf937ea89bc7893db5176;hp=25cf84cf377c0aae5dbcf937ea89bc7893db5176;p=safe%2Fjmp%2Flinux-2.6

Merge git://git./linux/kernel/git/amit/virtio-console

* git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console:
  virtio: console: Use better variable names for fill_queue operation
  virtio: console: Fix type of 'len' as unsigned int
---