From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Jun 2011 17:45:10 +0000 (-0700)
Subject: Merge branches 'x86-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=842c895d140a75e5d67fa346213deb3ca2b460f8;p=linux-beck.git

Merge branches 'x86-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: devicetree: Add missing early_init_dt_setup_initrd_arch stub
  x86: cpu-hotplug: Prevent softirq wakeup on wrong CPU

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Prevent potential NULL dereference in irq_set_irq_wake()
---

842c895d140a75e5d67fa346213deb3ca2b460f8