From: Linus Torvalds Date: Tue, 31 Mar 2009 00:57:39 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=db6f204019380c788f1de06ee937bdbccd60e5c0;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio: lguest: barrier me harder lguest: use bool instead of int lguest: use KVM hypercalls lguest: wire up pte_update/pte_update_defer lguest: fix spurious BUG_ON() on invalid guest stack. virtio: more neatening of virtio_ring macros. virtio: fix BAD_RING, START_US and END_USE macros --- db6f204019380c788f1de06ee937bdbccd60e5c0