summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2020-05-05 21:16:47 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2020-05-05 21:16:47 +1000
commitf2b8d76dc6db379160ad8875f97336db2069e7bd (patch)
tree9334fc694bc5c9710563d3381b395b6985b09bcd /include/asm-generic
parentae83d0b416db002fe95601e7f97f64b59514d936 (diff)
parentae49dedaa92b55258544aace7c585094b862ef79 (diff)
Merge tag 'kvm-ppc-fixes-5.7-1' into topic/ppc-kvm
This brings in a fix from the kvm-ppc tree that was merged to mainline after rc2, and so isn't in the base of our topic branch. We'd like it in the topic branch because it interacts with patches we plan to carry in this branch.
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions