]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v4.13-rc1' into fixes
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Jul 2017 10:20:29 +0000 (20:20 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Jul 2017 10:20:29 +0000 (20:20 +1000)
commitc40fea0c84a9d8e40edb3951477b87a13718af3e
tree36f4acc50e3fabac71fadd34c720c0a6011db470
parent13cee2c1500663930b09616ae5e0f1f9ce0b6ceb
parent9238ecfbaaeffcf7977c2776af9c57c0a4a878ed
Merge tag 'v4.13-rc1' into fixes

The fixes branch is based off a random pre-rc1 commit, because we had
some fixes that needed to go in before rc1 was released.

However we now need to fix some code that went in after that point, but
before rc1, so merge rc1 to get that code into fixes so we can fix it!
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/smp.c