summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-13 10:45:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-13 10:45:10 -0700
commit842c895d140a75e5d67fa346213deb3ca2b460f8 (patch)
treedcf4a61907e96739ab97de7592f8cc68fd508d3c
parent562d1ffed2082fc59fb72173b856822ffe781559 (diff)
parent977cb76d52e7aa040e18a84b29fe6fd80d79319b (diff)
parent13863a66c9c8a663665445cf05d68de96ff31830 (diff)
downloadlinux-842c895d140a75e5d67fa346213deb3ca2b460f8.tar.gz
linux-842c895d140a75e5d67fa346213deb3ca2b460f8.tar.bz2
linux-842c895d140a75e5d67fa346213deb3ca2b460f8.zip
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()