diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-11-09 14:30:24 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2017-11-09 14:30:24 +1100 |
| commit | 072df8130c6b602c8ee219f7b06394680cafad2f (patch) | |
| tree | ad7cbc2342be72236851b19a5d9e8a0908dbbdf7 /include/uapi/drm | |
| parent | c01015091a77035de1939ef106bfbcaf9a21395f (diff) | |
| parent | 38c53af853069adf87181684370d7b8866d6387b (diff) | |
| download | op-kernel-dev-072df8130c6b602c8ee219f7b06394680cafad2f.zip op-kernel-dev-072df8130c6b602c8ee219f7b06394680cafad2f.tar.gz | |
Merge branch 'kvm-ppc-fixes' into kvm-ppc-next
This merges in a couple of fixes from the kvm-ppc-fixes branch that
modify the same areas of code as some commits from the kvm-ppc-next
branch, in order to resolve the conflicts.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'include/uapi/drm')
0 files changed, 0 insertions, 0 deletions
