git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
787c57c
35fd3dc
)
Merge remote-tracking branch 'master' into queue
author
Marcelo Tosatti
<mtosatti@redhat.com>
Mon, 29 Oct 2012 21:15:32 +0000
(19:15 -0200)
committer
Marcelo Tosatti
<mtosatti@redhat.com>
Mon, 29 Oct 2012 21:15:32 +0000
(19:15 -0200)
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff