projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c91efc a225f15)
Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 Dec 2018 11:11:54 +0000 (22:11 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 Dec 2018 11:11:54 +0000 (22:11 +1100)
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.

1  2 
arch/powerpc/kernel/legacy_serial.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/legacy_serial.c
Simple merge
John Crispins staging tree