]> 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>
Wed, 3 Dec 2008 10:38:37 +0000 (12:38 +0200)
committerAvi Kivity <avi@redhat.com>
Wed, 3 Dec 2008 10:38:37 +0000 (12:38 +0200)
commita95fa51d59455f4acea7694854a946b45cbfbe4c
tree5c38be78d781142de88879baaebc0f18e4633970
parent85a3304c969c64565fca282c6a33f59ff98fa712
parentf6f7b52e2f6149d2ee365717afff315b05720162
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/powerpc/kvm/powerpc.c
arch/x86/kvm/vmx.c

Signed-off-by: Avi Kivity <avi@redhat.com>
arch/powerpc/include/asm/kvm_ppc.h
arch/x86/kernel/kvmclock.c