tree d33acaf62889bf6304f6109dd69923a17ab938be
parent 516fa8d0e19d854253460ea7692551e836e7e2b5
parent 1a92a80ad386a1a6e3b36d576d52a1a456394b70
author Michael Ellerman <mpe@ellerman.id.au> 1503490810 +1000
committer Michael Ellerman <mpe@ellerman.id.au> 1503490810 +1000

Merge branch 'fixes' into next

There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.