| commit | db6f204019380c788f1de06ee937bdbccd60e5c0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 17:57:39 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 17:57:39 2009 -0700 |
| tree | f8ca32ab6932a21797dbc5aa77688ea017959da0 | |
| parent | 3c6fae67d026d57f64eb3da9c0d0e76983e39ae3 [diff] | |
| parent | d1881d3192a3d3e8dc4f255b03187f4c36cb0617 [diff] |
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