]> www.infradead.org Git - users/dwmw2/linux.git/commit
projects / users / dwmw2 / linux.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 27c7893 c5974b8)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 5 Jan 2010 19:03:21 +0000 (17:03 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 5 Jan 2010 19:03:21 +0000 (17:03 -0200)
commit021b08da8f09226e9c45b256a039b3a8622eb4a9
treef2744f9aad9b7e5f67da295cae2cc54000ccacf2tree
parent27c7893eecd6be17009ff991c8cebadd5a7fa55dcommit | diff
parentc5974b835a909ff15c3b7e6cf6789b5eb919f419commit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/

Conflicts:
virt/kvm/assigned-dev.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
MAINTAINERS diff1 | diff2 | blob | history
virt/kvm/kvm_main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.