]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35b8e2b e4903fb)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAvi Kivity <avi@qumranet.com>
Thu, 26 Jul 2007 05:27:53 +0000 (08:27 +0300)
committerAvi Kivity <avi@qumranet.com>
Thu, 26 Jul 2007 05:27:53 +0000 (08:27 +0300)
Conflicts:

drivers/kvm/kvm_main.c


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