Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit805e318548fa0f6007bcece06bde1ddd9393246c
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jun 2013 18:16:07 +0000 (20 08:16 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jun 2013 18:16:07 +0000 (20 08:16 -1000)
tree421f6d22d9b57289110da25520f0104e0bd338b6
parent4db88eb4c300333ed37585f75ab9a664ec537d68
parent29ce3785b22da47c49f4ef6e14b9014fa5dee261
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()