From: Linus Torvalds Date: Wed, 19 Sep 2007 18:38:25 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f15f41383d466860f8b22f669da8c841f8d73c3b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix timekeeping on PowerPC 601 [POWERPC] Don't expose clock vDSO functions when CPU has no timebase [POWERPC] spusched: Fix null pointer dereference in find_victim --- f15f41383d466860f8b22f669da8c841f8d73c3b