Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 25 Oct 2007 22:38:19 +0000 (15:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 25 Oct 2007 22:38:19 +0000 (15:38 -0700)
commit2c7505570353af02e48c58ab4d109edd9bbbdd81
treeece17dd6b25fa7a66eedf57a87174f13eb7b483a
parentfc42dabe465d478311423039448d9dc9051e5f6b
parente1e72965ec2c02db99b415cd06c17ea90767e3a4
Merge git://git./linux/kernel/git/rusty/linux-2.6-lguest

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest:
  lguest: documentation update
  lguest: Add to maintainers file.
  lguest: build fix
  lguest: clean up lguest_launcher.h
  lguest: remove unused "wake" element from struct lguest
  lguest: use defines from x86 headers instead of magic numbers
  lguest: example launcher header cleanup.