| commit | 19bf7f8ac3f8131100027281c495dbbe00cd5ae0 | [log] [tgz] |
|---|---|---|
| author | Marcelo Tosatti <mtosatti@redhat.com> | Mon Oct 29 19:15:32 2012 -0200 |
| committer | Marcelo Tosatti <mtosatti@redhat.com> | Mon Oct 29 19:15:32 2012 -0200 |
| tree | 270b97e3ca47c0f62a1babca2ae37f79a76a309c | |
| parent | 787c57c0fb393fe8a3974d300ddcfe30373386fe [diff] | |
| parent | 35fd3dc58da675d659513384221349ef90749a01 [diff] |
Merge remote-tracking branch 'master' into queue 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>