From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 25 Oct 2007 22:38:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest
X-Git-Tag: v2.6.24-rc2~142
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c7505570353af02e48c58ab4d109edd9bbbdd81;p=linux-2.6

Merge git://git.kernel.org/pub/scm/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.
---

2c7505570353af02e48c58ab4d109edd9bbbdd81