From: Linus Torvalds Date: Fri, 28 Mar 2008 01:52:43 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8536bbaff44addff8d2ac66da1156c95b1e00c4e;p=linux-beck.git Merge git://git.kernel.org/pub/scm/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 --- 8536bbaff44addff8d2ac66da1156c95b1e00c4e