]> www.infradead.org Git - users/dwmw2/linux.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAvi Kivity <avi@redhat.com>
Thu, 13 Nov 2008 10:37:14 +0000 (12:37 +0200)
committerAvi Kivity <avi@redhat.com>
Thu, 13 Nov 2008 10:37:14 +0000 (12:37 +0200)
commitea17a984c46a311e526d1e840b70504e459513df
tree0af12b7b6acf37d781eca1e2d3cb5be89ecd577d
parent41e632a655b5f38f5fe2992d908ebe4d8e01e843
parent4ffaf869c7780bbdfc11291e5fd4b61dde662b1c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/x86/kvm/vmx.c

Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/vmx.c