Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Mar 2010 00:04:03 +0000 (16:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Mar 2010 00:04:03 +0000 (16:04 -0800)
* 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


Trivial merge