| commit | 57d1da871b85c3a79e070d5cfc5ccb554ed839c4 | [log] [tgz] |
|---|---|---|
| author | Radim Krčmář <rkrcmar@redhat.com> | Tue Dec 06 14:49:05 2016 +0100 |
| committer | Radim Krčmář <rkrcmar@redhat.com> | Tue Dec 06 14:49:05 2016 +0100 |
| tree | a697ed84ef44a6fe97abf4376ee56d03ae3d2e67 | |
| parent | ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f [diff] | |
| parent | e34af7849014f1d80899b811cf9021588cb8dd88 [diff] |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc Eliminate merge conflict between 9e5f68842276 and ebe4535fbe7a.