Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:46:11 +0000 (08:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:46:11 +0000 (08:46 -0700)
commit2f6a123821a7feaba7cee787ef0f21d2354d1730
treeef4b2f055e23945039b732101cb68e4f7eeb3de8
parent6f02bfc404decf5b5046f1413ef941e1870912f7
parente22a539824e8ddb82c87b4f415165ede82e6ab56
Merge git://git./linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  lguest: allow booting guest with CONFIG_RELOCATABLE=y
  virtio: Add text copy of spec to Documentation/virtual.