Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:45:03 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:45:03 +0000 (15:45 -0700)
commit636667a545b2d16797f27002a65d688c195c9b60
tree3acfe7b5aefc4f71d484a5186365963c51a70314
parentceadda057c000fa82e6bbe508923d8181414dea7
parent60e5e0b84045ce0f6ab07a02c7fcd6627b53d2d3
Merge branch 'virtio' of git://git./linux/kernel/git/rusty/linux-2.6-for-linus

* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: console: Fix crash when port is unplugged and blocked for write
  virtio: console: Fix crash when hot-unplugging a port and read is blocked
  virtio-blk: fix minimum number of S/G elements