Skip to content
Commit 57d1da87 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

Eliminate merge conflict between 9e5f6884 and ebe4535f.
parents ffcb09f2 e34af784
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment