Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Mar 2008 01:52:43 +0000 (18:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Mar 2008 01:52:43 +0000 (18:52 -0700)
commit8536bbaff44addff8d2ac66da1156c95b1e00c4e
tree56b11bc2107e6683b40d9eceb47a3242348ec43e
parent7529963cb9c5db6821f0a00fc8426ebed79fc2e0
parenta6bd8e13034dd7d60b6f14217096efa192d0adc1
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: comment documentation update.
  lguest: Don't need comment terminator before disk section.
  lguest: lguest.txt documentation fix
  lguest: Add puppies which where previously missing.
  virtio_pci: unregister virtio device at device remove