]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* 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.


Trivial merge