tree d49254d7ae4759ab85a2944843f73adaa6865e0a
parent e697b8d13ede3893724898d983eff3f8c9183643
parent 42b36cc0ce717deeb10030141a43dede763a3ebe
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194894811 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194894811 -0800

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