From: Linus Torvalds Date: Mon, 15 Aug 2011 15:46:11 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Tag: v3.1-rc3~37 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2f6a123821a7feaba7cee787ef0f21d2354d1730;p=linux-block.git 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. --- 2f6a123821a7feaba7cee787ef0f21d2354d1730