From: Linus Torvalds Date: Thu, 5 Jul 2007 22:55:00 +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=0dac723e5c15ddb9bd26c1db21ee64ab71ae4925;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] Update defconfigs [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver [POWERPC] Fix PMI breakage in cbe_cbufreq driver [POWERPC] Disable old EMAC driver in arch/powerpc --- 0dac723e5c15ddb9bd26c1db21ee64ab71ae4925