]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAvi Kivity <avi@redhat.com>
Sun, 4 Oct 2009 08:39:49 +0000 (10:39 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 4 Oct 2009 08:40:48 +0000 (10:40 +0200)
Signed-off-by: Avi Kivity <avi@redhat.com>
1  2 
virt/kvm/kvm_main.c

Simple merge