]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0080da 5955c7a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAvi Kivity <avi@redhat.com>
Wed, 18 Feb 2009 11:06:46 +0000 (11:06 +0000)
committerAvi Kivity <avi@redhat.com>
Wed, 18 Feb 2009 11:06:46 +0000 (11:06 +0000)
Conflicts:
arch/x86/include/asm/kvm.h

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

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