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)
Merge one commit from Scott which I missed while away.

1  2 
arch/powerpc/kernel/traps.c

Simple merge