Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 20 Sep 2017 10:05:24 +0000 (20:05 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 20 Sep 2017 10:05:24 +0000 (20:05 +1000)
commitb134165eadd6dd07c49f8db40b218185ca3130b0
treea6271c7d5567f946e574b2dd0b26f06c3a331987
parent5d298baa41883fc421acfd932799c0f4177249ae
parenta4e89ffb59235fd11d27107dea3efa4562ac0a12
Merge branch 'next' of git://git./linux/kernel/git/scottwood/linux into fixes

Merge one commit from Scott which I missed while away.
arch/powerpc/kernel/traps.c