diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 22:43:43 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 22:43:43 +1100 |
commit | 5400fc229e6078a6964b15fb98e9a994df3d642a (patch) | |
tree | eaaed61828654237ace607f45b5ba3aa42ce1160 /arch/powerpc/kernel/vmlinux.lds.S | |
parent | 02ef6dd8109b581343ebeb1c4c973513682535d6 (diff) | |
parent | 76b03dc07eebe9c8829bc4c40ae357ad04b4b8c1 (diff) | |
download | talos-obmc-linux-5400fc229e6078a6964b15fb98e9a994df3d642a.tar.gz talos-obmc-linux-5400fc229e6078a6964b15fb98e9a994df3d642a.zip |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we share with kvm-ppc, this brings in two xive
commits, one from Paul to rework HMI handling, and a minor cleanup to
drop an unused flag.
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
0 files changed, 0 insertions, 0 deletions