commit 842c895d140a75e5d67fa346213deb3ca2b460f8
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jun 13 10:45:10 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jun 13 10:45:10 2011 -0700
tree dcf4a61907e96739ab97de7592f8cc68fd508d3c
parent 562d1ffed2082fc59fb72173b856822ffe781559
parent 977cb76d52e7aa040e18a84b29fe6fd80d79319b
parent 13863a66c9c8a663665445cf05d68de96ff31830

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()