From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Jun 2013 18:16:07 +0000 (-1000)
Subject: Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=805e318548fa0f6007bcece06bde1ddd9393246c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'core-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull cpu idle fixes from Thomas Gleixner:
 - Add a missing irq enable. Fallout of the idle conversion
 - Fix stackprotector wreckage caused by the idle conversion

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  idle: Enable interrupts in the weak arch_cpu_idle() implementation
  idle: Add the stack canary init to cpu_startup_entry()
---

805e318548fa0f6007bcece06bde1ddd9393246c