From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 12 Nov 2007 19:13:31 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux... 
X-Git-Tag: v2.6.24-rc3~154
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=05f3f415894d061f7d3e77e3d46caeb4c184b005;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-virtio

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-virtio:
  virtio: Force use of power-of-two for descriptor ring sizes
  lguest: Fix lguest virtio-blk backend size computation
  virtio: Fix used_idx wrap-around
  virtio: more fallout from scatterlist changes.
  virtio: fix vring_init for 64 bits
---

05f3f415894d061f7d3e77e3d46caeb4c184b005