]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5ac799 0c8454f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAvi Kivity <avi@redhat.com>
Sun, 26 Apr 2009 12:22:10 +0000 (15:22 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 26 Apr 2009 12:22:10 +0000 (15:22 +0300)
Conflicts:
arch/ia64/kvm/kvm-ia64.c
arch/x86/kvm/mmu.c
include/linux/kvm.h

Signed-off-by: Avi Kivity <avi@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.