]> 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)
commit043ad5d48ce7d0a2f5df6c75c96abdfd14cb66b3
tree36f4acc50e3fabac71fadd34c720c0a6011db470
parent0c703bca39114cc8334ea117e512a5b06a2f67f4
parentc1e7f93cfc9ccbe5772b8d0eb3da04ab3bcc7881
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