diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-12-17 22:11:54 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-12-17 22:11:54 +1100 |
commit | 4d6a19827387d8448afa1f5959b809ed2ba090d6 (patch) | |
tree | 74defc825e1ca6af3a09869e689eb1007190f891 /arch/powerpc/kernel/idle.c | |
parent | 7c91efce1608325634494b25ff6491320208e457 (diff) | |
parent | a225f1567405558fb5410e9b2b90805819df1c67 (diff) | |
download | talos-obmc-linux-4d6a19827387d8448afa1f5959b809ed2ba090d6.tar.gz talos-obmc-linux-4d6a19827387d8448afa1f5959b809ed2ba090d6.zip |
Merge branch 'fixes' into next
Merge our fixes branch again, this has a couple of build fixes and also
a change to do_syscall_trace_enter() that will conflict with a patch we
want to apply in next.
Diffstat (limited to 'arch/powerpc/kernel/idle.c')
0 files changed, 0 insertions, 0 deletions